Daniel Grippi
eb6fc5f130
Merge pull request #2367 from lprelle/newhere_to_locale_translation
...
#NewHere to locale translation
2011-11-09 16:09:12 -08:00
Lennart Prelle
f2997f5146
change #newhere to translation
2011-11-09 20:38:06 +01:00
Maxwell Salzberg
8cab4cb2e2
open up tag show publisher, have a cuter message on the page
2011-11-08 12:34:06 -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
6f7c9e9301
Remove resque_rescheduler as it was killing our app servers (receiving
...
http requests).
Revert "retry less"
This reverts commit 7784156e3b80cdcd4eddbcbc86e502
2011-11-07 12:50:02 -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
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
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
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
danielgrippi
c9f069d000
Revert "add participant_users to conversations"
...
This reverts commit 655558cb95f85a047f6fcde12ec232a552fc80c02c12b94e677417801886abd211ba72
2011-11-05 18:08:32 -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
Sarah Mei
29f5ce1577
try breaking up travis build into components
2011-11-04 21:35:06 -07:00
Maxwell Salzberg
f85a047f6f
MS DG; for real this time?
2011-11-04 19:56:53 -07:00
Maxwell Salzberg
2c12b94e67
dont ban diasporahq stuff
2011-11-04 19:08:08 -07:00
Maxwell Salzberg
b7d0ec7564
fix spelling and update job to use less obtrusive query
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
c3dc3d103b
include post author in participats
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24
MS DG add participants
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
dfd1286521
dry up multi stream
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
abd211ba72
dry up multi stream
2011-11-04 18:45:51 -07:00
Maxwell Salzberg
5baaa6dae2
fix update public_tag_stream
2011-11-04 18:45:20 -07:00
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14:34 -07:00
Maxwell Salzberg
016032cf95
do not pull back all tag ids; way to go maxwell :(
2011-11-04 16:54:34 -07:00
Maxwell Salzberg
91d940376f
small hack untill we can figure out more batching
2011-11-04 00:46:44 -07:00
Ilya Zhitomirskiy
ce199e770d
dk iz querying by id in status message tag_stream
2011-11-03 22:20:06 -07:00
Maxwell Salzberg
ff36b84df5
dont double query a slow query
2011-11-03 17:46:58 -07:00
danielgrippi
b56dc9205b
added ignore text on user pages if it applies
2011-11-03 12:31:25 -07:00
danielgrippi
0ab23f337a
fixed all cukes; view bugs on streams
2011-11-03 12:31:24 -07:00
danielgrippi
07f713f46c
change 'mute' to 'ignore' for now; fix specs; repopulate cache upon
...
contact removal
2011-11-03 12:31:24 -07:00
danielgrippi
5df6bc1adf
block user now removes a contact if user is blocking a contact
2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf
DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself
2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c
DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams
2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
5b8365118d
Stream#posts no longer needs to call for_a_stream
...
exclude blocked users from all streams
2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
0eb33b371b
blocked users works for multi stream, cuke passes
...
fixed scoping stuff
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9
wip
2011-11-03 12:31:24 -07:00
Daniel Grippi
ed029b2fbd
Merge pull request #2251 from manuels/retry_federations
...
Retry federation if remote pod is down
2011-11-02 14:09:30 -07:00
Maxwell Salzberg
98b093be11
ugh
2011-11-02 11:43:58 -07:00
Maxwell Salzberg
10575a8b78
this is getting dumb
2011-11-02 11:30:19 -07:00
Maxwell Salzberg
e9a5904ee6
try and fix it again
2011-11-02 11:25:10 -07:00
Maxwell Salzberg
3e20dcd3ba
another chance at fixing emails
2011-11-02 11:21:16 -07:00
Maxwell Salzberg
e505163334
fix message bus mailer problem
2011-11-02 10:51:08 -07:00
Ilya Zhitomirskiy
22bf404344
saving instead of emailing retention stats
2011-11-02 10:15:40 -07:00
danielgrippi
7ffeeb142b
don't ajax in the multi stream
2011-11-01 15:30:27 -07:00
