nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9749 commits 4 branches 0 tags 121 MiB
Commit graph

9749 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
77a6c7045b update newrelic_rpm 2011-11-08 15:39:36 -08:00
Maxwell Salzberg
57989cb98e fix final tag stream spec 2011-11-08 13:56:34 -08:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Jonne Hass
730d2d9754 add missing .html_safe 2011-11-08 21:32:15 +01:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -08:00
Jonne Hass
a7bed99411 updated 18 locale files [ci skip] 2011-11-08 17:27:17 +01:00
Jonne Hass
2cad824c82 remove resque-scheduler from start scripts (resque-retry revert) 2011-11-08 13:40:18 +01:00
Jonne Hass
0a29408497 fixed order dependent spec 2011-11-08 12:03:17 +01:00
Ilya Zhitomirskiy
63ba45f0a7 Merge branch 'close_popovers' 2011-11-07 23:14:21 -08:00
Ilya Zhitomirskiy
e1253c4018 fade in on hover, larger x on the welcome div 2011-11-07 23:11:48 -08:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
Maxwell Salzberg
fe3fe0f5cc MS SM save sync cache if you have some sort of contacts 2011-11-07 19:52:48 -08:00
danielgrippi
0f19076b40 update selenium-driver to work in FF8 2011-11-07 16:48:28 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
danielgrippi
9d91b70f9d fix scope 2011-11-07 12:18:23 -08:00
danielgrippi
8da1d6a7fc multi stream hotfix (re: cache) 2011-11-07 12:15:24 -08:00
danielgrippi
b53df6dd4d repopulating the redis cache should clear the entire set first 2011-11-07 11:28:29 -08:00
danielgrippi
fd76cfd4c5 fix construct_shareable_from_others_query to only include posts from contacts within your aspects 2011-11-07 10:52:31 -08:00
Jonne Hass
1d0109d4cb fix timeago widget 2011-11-07 16:33:38 +01:00
Jonne Hass
56ab1991c2 updated 55 locale files [ci skip] 2011-11-07 12:35:43 +01:00
Pistos
39f876824a Specify a fixture path relative to Rails.root to appease the Travis. 2011-11-07 00:32:18 -05:00
Pistos
02fa065571 Whitespace cleanup. 2011-11-07 00:32:17 -05:00
Sarah Mei
f1d669a024 Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those. 2011-11-06 21:29:22 -08:00
Maxwell Salzberg
35216808e0 do not specifiy order for a scope that does not have to do with order 2011-11-06 21:16:57 -08:00
Sarah Mei
0fc43b580b Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx. 2011-11-06 20:27:36 -08:00
Sarah Mei
dbc68e69b7 Merge branch 'master' of github.com:diaspora/diaspora 2011-11-06 20:20:36 -08:00
Sarah Mei
4fba9a6989 get rid of all pending specs except the one that is actually pending 2011-11-06 20:20:27 -08:00
danielgrippi
de88c0ab48 correct newrelic_ignore 2011-11-06 19:35:30 -08:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Sarah Mei
53dbbfbb15 Fix order-dependent test that would sometimes fail on postgres 2011-11-06 19:10:26 -08:00
Jonne Hass
a216252fe0 we cause too much load on travis: if you have a fork and use travis please turn it off; run oauth-cucumber inside other build to reduce builds and save (setup) time. 2011-11-07 01:38:22 +01:00
Jonne Hass
78e03056e8 little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set 2011-11-06 23:03:20 +01:00
Pistos
510bd7f0db Merge pull request #2334 from dmorley/patch-1 
http://podup.sargodarya.de is now 5 months out of date, most pods are gon
 2011-11-06 13:14:32 -08:00
Jonne Hass
9a556f7cb2 Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug 
2307 private inbox bug
 2011-11-06 13:12:03 -08:00
Sarah Mei
db223b2a3f Rename and make pending the spec for populating the cache 2011-11-06 12:52:01 -08:00
Ilya Zhitomirskiy
7200b0d9b3 checking if the cache exists on the redis key 2011-11-06 11:29:36 -08:00
danielgrippi
5214556882 don't ensure populated on querying... we can do this in a job later 2011-11-06 11:14:19 -08:00
buddhamagnet
d8a22da275 amended view to pass in time to translated string for private inbox thread time display 2011-11-06 18:47:51 +00:00
buddhamagnet
e9b1f35484 added text for 'ago' 2011-11-06 18:13:35 +00:00
buddhamagnet
77474b214a added translateable text to inbox thread times 2011-11-06 18:08:51 +00:00
Jonne Hass
af1558831b Improved reshare receive 
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
 2011-11-06 18:26:10 +01:00
Raphael Sofaer
eb4c588476 Merge pull request #2336 from dmorley/patch-3 
blacklist example admin username
 2011-11-06 09:11:03 -08:00
David Morley
d848537df8 blacklist example admin username 2011-11-06 09:07:13 -08:00
Jonne Hass
50baa4ba92 also link to the translated tag 2011-11-06 18:06:26 +01:00
David Morley
a72e7e5196 http://podup.sargodarya.de is now 5 months out of date, most pods are gone on there, listings are all wrong. changed to podupti.me 2011-11-06 08:21:04 -08:00
Jonne Hass
a1eee6e90f made help tags translatable so that local communities can take care of the new users, also fixed #2327 2011-11-06 16:43:13 +01:00
Jonne Hass
80cdcd4edd supress resque retries 2011-11-06 16:05:23 +01:00
Jonne Hass
9ffeef9d20 Merge branch 'new_user_language' of https://github.com/alda519/diaspora 2011-11-06 15:17:05 +01:00
Jonne Hass
7556dccb91 test that photosController#index succeeds without any photos 2011-11-06 14:47:28 +01:00