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

1351 commits

Author SHA1 Message Date
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
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
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