danielgrippi
d0f58e1bd4
Revert "upgrade devise; devise_invitable"
...
This reverts commit 0f56ee7b77 .
2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77
upgrade devise; devise_invitable
2011-12-06 10:50:29 -08:00
Daniel Grippi
0d41c9c5f3
update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner)
2011-12-05 19:53:03 -08:00
danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf .
Conflicts:
config/locales/diaspora/en.yml
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
31b43f315e
Corrected the message length spec.
2011-11-09 21:35:16 -05:00
Pistos
e5d37c7949
Whitespace cleanup.
2011-11-09 21:35:08 -05:00
Daniel Grippi
319d72deb9
Merge pull request #2345 from 21echoes/higher_post_limit
...
higher post limits
2011-11-09 16:11:39 -08:00
Jonne Hass
0a29408497
fixed order dependent spec
2011-11-08 12:03:17 +01: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
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
fd76cfd4c5
fix construct_shareable_from_others_query to only include posts from contacts within your aspects
2011-11-07 10:52:31 -08:00
Sarah Mei
f1d669a024
Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those.
2011-11-06 21:29:22 -08:00
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
Sarah Mei
db223b2a3f
Rename and make pending the spec for populating the cache
2011-11-06 12:52:01 -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
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
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
Maxwell Salzberg
f85a047f6f
MS DG; for real this time?
2011-11-04 19:56:53 -07:00
Maxwell Salzberg
a552fc80c0
fix small commenting email bug #oops
2011-11-04 19:24:48 -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
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14:34 -07:00
danielgrippi
9ef0fbfe60
DG MS; fix last failing spec
2011-11-03 21:08:32 -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
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
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
danielgrippi
90f990e8dd
use the cache if cache size is less than limit
2011-10-31 17:07:30 -07:00
Lennart Prelle
f2123d942d
make language for email-invitation available
2011-10-31 21:11:47 +01:00
Manuel Schölling
bcbc86e502
Retry federation if remote pod is down
2011-10-27 00:36:55 +02:00
danielgrippi
0512ade65a
made name smaller and clickable on aspects/index [ci skip]
2011-10-24 21:43:32 -07: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
Ilya Zhitomirskiy
c60adda3a9
WIP, almost done for twitter, just need to figure out how to follow redirects
2011-10-24 11:00:00 -07:00
Maxwell Salzberg
484f46d70f
add validation which prevent user for signing up with dead username. fix cucumber features
2011-10-20 16:32:09 -07:00
danielgrippi
44b58d707f
featured users => community spotlight
2011-10-20 11:50:58 -07:00