Commit graph

529 commits

Author SHA1 Message Date
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
Raphael
0daffb7fed Add a couple specs, refactor in connecting 2010-11-21 14:09:39 -05:00
Sarah Mei
90193a16f5 fix 1.9 build 2010-11-19 23:14:08 -08:00
zhitomirskiyi
8524311c51 added the photo rake task 2010-11-19 16:46:23 -08:00
zhitomirskiyi
152998311f added the comments as well as loading of app config 2010-11-19 11:25:13 -08:00
zhitomirskiyi
481204a157 mongo cloudfiles backup task 2010-11-19 10:57:28 -08:00
zhitomirskiyi
ff5e32d2b8 begining of a rake task for mongo backup 2010-11-18 18:38:03 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
Raphael
78f2f74186 Fix photo exporting, I'm not sure how to use
Kernel::system in this case, so using ``
2010-11-18 16:41:34 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Raphael
5a2b3cd0a7 Fix build 2010-11-18 16:06:44 -08:00
maxwell
c0d10ef174 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-18 15:36:47 -08:00
maxwell
747ab761a0 pushing mailer spec for ilya 2010-11-18 15:36:30 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
maxwell
970d56a007 basic batch inviter 2010-11-18 15:17:22 -08:00
maxwell
3db8da992a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:12 -08:00
maxwell
c08a991130 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:00 -08:00
Raphael
37a694ed1f Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects 2010-11-17 18:49:03 -08:00
Raphael
cb23ed1136 typo 2010-11-17 18:49:03 -08:00
Raphael
4f9547b300 Adding logging 2010-11-17 16:06:16 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d Add logging statements, rescue callbacks in em-webfinger 2010-11-17 13:55:58 -08:00
Raphael
2d347ec36d Delete an accepted friend request 2010-11-16 16:47:06 -08:00
Raphael
538c6ce4b9 Take handle validations out of em-webfinger 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Sarah Mei
9fa47c9bfa Fix a failing spec under 1.9 in receive_spec 2010-11-15 21:19:21 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
zhitomirskiyi
7d39f8ae5f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:36:11 -08:00
zhitomirskiyi
a6dff4f78e removing the posts from the aspect on unfriending 2010-11-08 15:35:37 -08:00
Raphael
70af10ee62 user#friends is now a many-foreign_key assoc, rather than a many-in 2010-11-08 15:19:23 -08:00
maxwell
26e1cfe955 MS RS actually fix the photo bug. without breaking the specs 2010-11-08 14:26:43 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
danielvincent
f4dba54ff3 posting to a person with a user on the same pod will send internally, skipping the http queue and encryption. 2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc separating object receiving in user#receive 2010-11-04 15:33:16 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
Raphael
03b272db60 Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC 2010-11-03 15:26:58 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00
maxwell
0343e7a226 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 00:10:11 -07:00
Sarah Mei
034d566564 CI has decided it wants a proper shell to launch the virtual display. So FINE. It can have one. 2010-11-02 21:49:24 -07:00
maxwell
545577a950 em-webfinger ssl should work 2010-11-02 19:16:08 -07:00
maxwell
8f5052fe61 Revert "Revert "making emwebfinger not try ssl first, for now""
This reverts commit 0db30bb221.
2010-11-02 18:59:42 -07:00