Commit graph

537 commits

Author SHA1 Message Date
danielvincent
c841a47a37 status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE. 2010-11-21 23:42:49 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -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
zhitomirskiyi
3d5cf8f625 added a panding cross path request spec 2010-11-19 18:53:46 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
be55384628 Add pending spec to invitations 2010-11-18 11:21:35 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
2d347ec36d Delete an accepted friend request 2010-11-16 16:47:06 -08:00
Raphael
f3a301d314 Don't expect raises in request specs, redirect to :back on all requesting 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
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Raphael
70bcab3abc adding a couple specs to invitation_spec 2010-11-15 16:34:59 -08:00
Raphael
2ad74d397c fix build 2010-11-13 19:05:12 -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
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
ae28a6f70c Don't pluralize in model spec name 2010-11-09 14:07:26 -08:00
Raphael
4818973643 Beginning to refactor invitations into an Invitation class 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
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07: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
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900 rename spec file 2010-11-05 11:26:49 -07:00
Raphael
4eba0595f9 Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -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
Raphael
7e568db032 Add a couple specs to user_spec 2010-11-04 15:23:58 -07:00
zhitomirskiyi
7f5b98a6cb the photo image url is now randomized 2010-11-04 14:37:08 -07:00
danielvincent
b33aa9a0fb retracting on a non existant post does not raise a permissions error. 2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -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
0ac4c5b04f IZ MS refactored invites to use user.build 2010-11-03 13:16:45 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00