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

1423 commits

Author SHA1 Message Date
Justin Thomas
3e1561db24 moved pass_file deletion to postgres code block 2011-11-29 11:34:50 -08:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Robsteranium
f7bde9b654 guid being set as "" somewhere (won't be assigned with ||= as "" is not nil). 2011-11-11 04:08:17 +00:00
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 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
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 655558cb95.

Revert "MS DG; for real this time?"

This reverts commit f85a047f6f.

Revert "MS DG; actually fix the bug"

This reverts commit cde12ec232.

Revert "fix small commenting email bug #oops"

This reverts commit a552fc80c0.

Revert "dont ban diasporahq  stuff"

This reverts commit 2c12b94e67.

Revert "Merge branch 'participants'"

This reverts commit 7417801886, reversing
changes made to abd211ba72.
 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
Justin Thomas
1b254ec2c5 removed legacy reference to a static path 2011-11-02 11:59:17 -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
Justin Thomas
221f58378d removed overlooked static path 2011-11-01 22:14:14 -07:00
danielgrippi
7ffeeb142b don't ajax in the multi stream 2011-11-01 15:30:27 -07:00
Justin Thomas
e50f0cfdb2 removed dependency on /tmp, improved retention period compliance, maintain legacy commands 2011-11-01 15:24:04 -07:00
danielgrippi
64c0591eac added first_name to csv task 2011-11-01 14:20:37 -07:00
danielgrippi
9de67aaee8 added rake task for generating a CSV of top actives from cohorts 2011-11-01 13:46:06 -07:00
Daniel Grippi
bfb4ac4bb4 Merge pull request #2296 from Pistos/issue-2264-fix-tag-parsing 
Issue 2264 fix tag parsing
 2011-10-31 22:43:28 -07:00
Pistos
b3853f48ed Way more test coverage for Taggable.format_tags . 2011-11-01 01:27:36 -04:00
Pistos
73c79bdc0d Make Taggable.format_tags more readable. 2011-11-01 00:41:56 -04:00
Pistos
24702b9f6a Add many more hashtag regexp specs for Taggable#tag_strings . Make them pass. 2011-11-01 00:28:04 -04:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
Maxwell Salzberg
37b29ac3e0 more messagebus debugging 2011-10-31 18:16:40 -07:00
Ilya Zhitomirskiy
c64588a68d adding attachments to all recepients 2011-10-31 18:09:43 -07:00
Ilya Zhitomirskiy
4be75a255f typo in the rake task 2011-10-31 18:09:43 -07:00
Maxwell Salzberg
eb223bee79 do a dumb thing to get better understanding of message bus errors 2011-10-31 18:09:43 -07:00
Maxwell Salzberg
3f184c4dae this is getting frusterating 2011-10-31 17:37:18 -07:00
Maxwell Salzberg
0a909d6475 less verbose about emails 2011-10-31 17:29:00 -07:00
danielgrippi
eaca7b98fe ajax in multi stream 2011-10-31 17:25:16 -07:00
Maxwell Salzberg
4e07d3199b wrap correct line in resque 2011-10-31 17:23:48 -07:00
danielgrippi
90f990e8dd use the cache if cache size is less than limit 2011-10-31 17:07:30 -07:00
Maxwell Salzberg
48e3e34cb1 do a dumb thing to get better understanding of message bus errors 2011-10-31 16:53:07 -07:00
Ilya Zhitomirskiy
9cadb99f8a sending csv as a file 2011-10-31 16:39:09 -07:00
Ilya Zhitomirskiy
d6824dcc49 Revert "remove custom logging, added hoptoad backend directly" 
This reverts commit ea72b1ae57.
 2011-10-31 15:12:08 -07:00
Ilya Zhitomirskiy
ea72b1ae57 remove custom logging, added hoptoad backend directly 2011-10-31 12:38:00 -07:00
Justin Thomas
68d5f9d196 backup task handles postgresql dumps 2011-10-29 23:35:02 -07:00
Pistos
aea2203794 Change #newhere prefill to #NewHere . 2011-10-28 22:11:23 -04:00
Ilya Zhitomirskiy
826e46ef2c fixed the batch email invitations 2011-10-27 18:22:19 -07:00
Ilya Zhitomirskiy
03380516f1 actually delivering the emails 2011-10-26 17:26:02 -07:00
Ilya Zhitomirskiy
53b27a7627 added a rake task to email retention to admins 2011-10-26 16:35:20 -07:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Maxwell Salzberg
1a521a792a zomg text collapse is finally back #thankgod 2011-10-25 19:46:09 -07:00
Maxwell Salzberg
d903ab7686 a small temp fix for tag markup getting in the way of markdown stuff 2011-10-25 19:21:07 -07:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
Maxwell Salzberg
2cbb61be75 make federation errors much louder so we can better debug issues temporarialy 2011-10-25 11:41:52 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
e7584261c7 removeing the tooltips after submit 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
1ccf965194 publisher lib, prefill, open, still need to do public first message for new users 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
ee74948863 wip welcome post, publisher object 2011-10-24 14:11:35 -07:00
Maxwell Salzberg
e087284daa fix the contacts link for the multi stream; make the contacts link default to the contacts page 2011-10-24 14:10:15 -07:00
Maxwell Salzberg
8a8f022f8b pass opts to multi link so commented on works 2011-10-24 14:05:30 -07:00
Maxwell Salzberg
083f788359 do something a little smarter to fix the string or int problem from last night 2011-10-24 12:01:09 -07:00
Maxwell Salzberg
7307960d82 wrote a failing test for what I think the lack of aspect notifier is; the cache is returning strings and not integers 2011-10-23 20:15:09 -07:00
Sarah Mei
b78ed1b794 Remove duplicate method declaration 2011-10-23 15:20:07 -07:00
Maxwell Salzberg
715982d73e don't raise when uniqueness contraints fail, as we already fail gracefully for these cases 2011-10-23 08:55:00 -07:00
Gonzalo Rodriguez
0a081b051c Fix more 'communtiy' typos 2011-10-23 01:39:23 -02:00