Sarah Mei
4fba9a6989
get rid of all pending specs except the one that is actually pending
2011-11-06 20:20:27 -08: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
Jakob Kramer
b8dbf1d81e
fixed 500 error if one is opening people's photos view and there are no images in the user's stream
2011-11-06 13:29:57 +01:00
Jonne Hass
13297eadc8
give correct scope in order clause
2011-11-06 09:26:14 +01:00
Jonne Hass
ca3c5fc6e8
do not assume mysql ordering in StatusMessage#tag_stream
2011-11-06 08:24:07 +01:00
Jonne Hass
09766288b0
do not send Expect header as many server don't like it
2011-11-06 07:11:55 +01:00
Sarah Mei
c2893a2e3d
Fix require problem with the acts_as_taggable patches
2011-11-05 22:38:14 -07:00
Sarah Mei
ac065e1706
Differentiate between oauth features and non-oauth features for travis.
2011-11-05 21:09:56 -07:00
Sarah Mei
a9ac7329d1
Add oauth features to travis as a separate build. Combinatoric explosion FTW
2011-11-05 20:40:16 -07:00
Sarah Mei
c30e3ee362
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-05 19:58:25 -07:00
Sarah Mei
2143e0f9ba
Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN.
2011-11-05 19:57:51 -07:00
Jonne Hass
ff590d1080
improved UX for ca_file setting [ci:skip]
2011-11-06 02:39:31 +01:00
danielgrippi
9a2ee973a3
make service icons larger
2011-11-05 18:13:31 -07:00
danielgrippi
c9f069d000
Revert "add participant_users to conversations"
...
This reverts commit 655558cb95f85a047f6fcde12ec232a552fc80c02c12b94e677417801886abd211ba72
2011-11-05 18:08:32 -07:00
Jonne Hass
74892b33da
give warden a failure app
2011-11-06 01:53:27 +01:00
Sarah Mei
3e70398c40
Run ostatus builder spec that sometimes causes nokogiri to segfault
2011-11-05 16:06:27 -07:00
Sarah Mei
04352d9771
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-05 16:05:24 -07:00
Sarah Mei
92c28857b3
Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory.
2011-11-05 16:05:13 -07:00
Jonne Hass
2b5963437f
updated 54 locale files [ci skip]
2011-11-05 23:44:12 +01:00
Jonne Hass
80e41f1ebb
decode the cookie through rails in the websocket server. Hopefully this is more stable
2011-11-05 23:13:46 +01:00
Dan Hansen & Maxwell Salzberg
2a4abc5483
show service icons on mobile site
2011-11-05 13:23:29 -05:00
Jonne Hass
f335c1881b
websocket really should stay running so catch TypeError too
2011-11-05 16:05:56 +01:00
Jonne Hass
6b9e7ef3ec
ugly thing to prevent crashing websocket for dmorley, hopefully
2011-11-05 15:59:33 +01:00
Jonne Hass
655558cb95
add participant_users to conversations
2011-11-05 12:09:36 +01:00
Jonne Hass
9ee3b2d080
improved closing account experience and fixed the cuke
2011-11-05 11:30:21 +01:00
Sarah Mei
1ecdba9bae
Fix facebook spec
2011-11-04 22:22:39 -07:00
Sarah Mei
0b329bf385
Fix notify local users spec
2011-11-04 22:16:55 -07:00
Sarah Mei
d17ecd6101
Fix user controller spec
2011-11-04 22:06:56 -07:00
Sarah Mei
c65bf16c8e
Oh yeah, change travis config too. :p
2011-11-04 21:36:17 -07:00
Sarah Mei
29f5ce1577
try breaking up travis build into components
2011-11-04 21:35:06 -07:00
Daniel Grippi
a87ba6cbfa
Merge pull request #2315 from Pistos/ie-make-user-menu-work
...
Total hax, but this is better than the user menu completely not working.
2011-11-04 21:02:25 -07:00
