danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf
2011-11-14 17:18:43 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a
Background sending password reset instructions.
2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf
auto follow back feature
2011-11-14 20:25:11 +01:00
Pistos
05b1e2fc19
Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag.
...
e.g. if "test" exists and you try to follow "Test".
2011-11-13 23:26:53 -05:00
David Kettler
74bcc6f06e
now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit
2011-11-07 21:21:36 -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
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
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
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
Jonne Hass
9ffeef9d20
Merge branch 'new_user_language' of https://github.com/alda519/diaspora
2011-11-06 15:17:05 +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
Sarah Mei
c2893a2e3d
Fix require problem with the acts_as_taggable patches
2011-11-05 22:38:14 -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
Jonne Hass
655558cb95
add participant_users to conversations
2011-11-05 12:09:36 +01:00
Maxwell Salzberg
cde12ec232
MS DG; actually fix the bug
2011-11-04 19:37:21 -07:00
Maxwell Salzberg
a552fc80c0
fix small commenting email bug #oops
2011-11-04 19:24:48 -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
95c206df24
MS DG add participants
2011-11-04 18:46:43 -07:00
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14:34 -07:00
danielgrippi
3296477531
eager load author and profile for comments
2011-11-04 16:40:14 -07:00
Maxwell Salzberg
2d4e6e4915
forgot to uncomment a line
2011-11-04 16:04:37 -07:00
Maxwell Salzberg
745e4dea8c
queue facebook lookup job, dont do it in process
2011-11-04 16:02:17 -07:00
Maxwell Salzberg
7784156e3b
retry less
2011-11-04 15:11:16 -07:00
Maxwell Salzberg
9bdde0d9af
another hack
2011-11-04 00:49:30 -07:00
Ilya Zhitomirskiy
ce199e770d
dk iz querying by id in status message tag_stream
2011-11-03 22:20:06 -07:00
danielgrippi
acf6936d7c
fix specs in contact
2011-11-03 20:48:02 -07:00
danielgrippi
b56dc9205b
added ignore text on user pages if it applies
2011-11-03 12:31:25 -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
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
debf382fac
Merge pull request #2306 from Pistos/issue-2298-following-dot-tags
...
Issue 2298 following dot tags
2011-11-02 21:29:48 -07:00
Pistos
78a96a18e4
This fixes issue #2298 .
...
Following a hashtag with a dot now no longer breaks the user's stream page.
All unacceptable hashtag chars are stripped out, and the given tag is
normalized before being followed.
2011-11-02 23:51:12 -04:00
danielgrippi
995996add1
add spec & change syntax in http_multi
2011-11-02 15:00:30 -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
Ilya Zhitomirskiy
41ccc6b28e
Revert "trying removing extending of empty module"
...
This reverts commit aaafeb27e4
2011-10-31 15:12:01 -07:00
Lennart Prelle
f2123d942d
make language for email-invitation available
2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
aaafeb27e4
trying removing extending of empty module
2011-10-31 12:53:27 -07:00
Manuel Schölling
bcbc86e502
Retry federation if remote pod is down
2011-10-27 00:36:55 +02:00
danielgrippi
19897df1ec
more first_name fixing
2011-10-24 21:34:56 -07:00
danielgrippi
e71fcea762
first_name now takes everything but the last word in the name field
2011-10-24 21:27:21 -07:00
danielgrippi
e63e8299b9
fixed up stream/publisher logic; fixed cukes
2011-10-24 14:41:15 -07:00
Ilya Zhitomirskiy
51778cb22d
storing the entriety of the service profile name in first name
2011-10-24 12:41:50 -07:00
Ilya Zhitomirskiy
d51516fff3
bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job
2011-10-24 11:00:00 -07:00
