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

879 commits

Author SHA1 Message Date
maxwell
25f388d903 MS DG made receive encapsulated in an object 2011-01-11 14:23:19 -08:00
maxwell
23de681cb8 DG MS moved receive methods to their respective models 2011-01-11 14:23:18 -08:00
zhitomirskiyi
86154ba348 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 17:26:42 -08:00
maxwell
153c4925d6 test for pubsubhububb jobs 2011-01-06 17:19:13 -08:00
zhitomirskiyi
8f2cad776b Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 17:14:59 -08:00
zhitomirskiyi
a92a374b96 added the files and fixed the tests 2011-01-06 17:14:39 -08:00
maxwell
cff387d651 make sure receive unescapes the payload before sending it to the job 2011-01-06 16:30:22 -08:00
zhitomirskiyi
0c8e6b0ba1 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 15:56:20 -08:00
zhitomirskiyi
3fae950905 also commented notification and sending ids into resque so that it works 2011-01-06 15:56:03 -08:00
maxwell
5818227904 adding job for posting to services 2011-01-06 13:13:09 -08:00
maxwell
a7d651236f make the postman work across everything. remove lots of now useless methods 2011-01-05 17:44:08 -08:00
maxwell
5e58eba240 new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times 2011-01-05 17:43:25 -08:00
maxwell
8819d288c4 i am greeen 2011-01-05 17:43:25 -08:00
maxwell
3fe30cde12 removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out 2011-01-05 17:43:25 -08:00
zhitomirskiyi
ce470e74ee notification calls email notification 2011-01-05 17:21:55 -08:00
zhitomirskiyi
82852db5ec added the files this time 2011-01-05 15:04:28 -08:00
zhitomirskiyi
7254db5cbc Revert "Revert "added comment on post mail method"" 
This reverts commit c9b3066599.
 2011-01-05 14:59:15 -08:00
zhitomirskiyi
c9b3066599 Revert "added comment on post mail method" 
This reverts commit c00226238b.
 2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b added comment on post mail method 2011-01-05 14:55:17 -08:00
zhitomirskiyi
f134cfd43f moved the test to the controller 2011-01-04 15:44:55 -08:00
Raphael
06d7ddbe0d Hopefully get rid of some problems with deleted accounts moving forward 2011-01-04 15:36:42 -08:00
Raphael
16d7ccdf0b fix youtube title stting 2011-01-04 11:48:02 -08:00
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -08:00
Michael Sofaer and Raphael Sofaer
331e6645c6 Just don't use count with select DISTINCT 2010-12-24 00:31:36 -08:00
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01 Fix retraction related failures in mysql 2010-12-23 23:04:04 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Sarah Mei
2b7eeffd5b Fix searching in mysql. It now does one query for all tokens. And person_spec is green! 2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04 33 failures left in mysql 2010-12-22 16:37:41 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
danielvincent
a1f3ab3046 mark requests as read when a user responds to the request 2010-12-21 10:31:18 -08:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Raphael
049670654e Connecting spec passes with mysql 2010-12-20 14:22:44 -08:00
Raphael
dcf630fd9a Request spec passes, no more scope on requests 2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
maxwell
e0883fb176 remove object_id for notifications thx sarahmei for pointing out my evil ways 2010-12-20 12:06:50 -08:00
Sarah Mei
c1bfbd358e Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know. 2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
51083e9659 Another 50 passes in mysql 2010-12-19 13:57:46 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -08:00
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
maxwell
9555fae33d no notifications on retractions 2010-12-15 13:14:46 -08:00
maxwell
b6754d92b7 adding basic notification class 2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6 adding basic notification class 2010-12-15 12:11:37 -08:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
MrZYX
36043845ca fixed requires for ruby 1.9 2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
Raphael
fc73c02c3a Fix hashes_for_person spec 2010-12-09 20:01:37 -08:00
maxwell
bf56364019 tests for post to services resque job 2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1 added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run 2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72 moar tests for services 2010-12-09 19:29:25 -08:00
maxwell
041e747db6 MSSM services are now broken out into seperate classes, and we cleaned up posting to them 2010-12-09 19:29:25 -08:00
Raphael
2be0666d80 Remove query from aspects manage, correct spec in User spec 2010-12-09 19:11:47 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00
danielvincent
e9742acc32 reverting http_post to a working state 2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6 request -> resource 2010-12-05 02:03:03 -08:00
danielvincent
737e6084df actually setting the timeout in restclient 2010-12-05 01:54:16 -08:00
maxwell
65c22020e8 fixing photo controllers spec 2010-12-05 00:45:13 -08:00
maxwell
2c09c35425 MS DG photos now delete sm if they are empty status messages, and status messages delete their photos 2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f fixed the build. made photos dependent destroy with parent status message 2010-12-05 00:45:13 -08:00
Raphael
36e1fb8b2c Fix a couple local-posting specs 2010-12-04 23:38:31 -08:00
Raphael
c99796f5db Extra spec on find_for_authentication 2010-12-04 23:15:22 -08:00
maxwell
03a5514400 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 23:06:58 -08:00
Raphael
61e40debb5 Fix in find_for_authentication 2010-12-04 22:25:28 -08:00
maxwell
fb310560df Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 19:37:47 -08:00
danielvincent
4c4f5c6aa4 dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND. 2010-12-04 19:36:22 -08:00
maxwell
b56b2fbd1b added spec for periods in usernames; unpendify a couple of specs 2010-12-04 19:33:58 -08:00
danielvincent
d1ad2efed1 HttpPost job now follows redirects 2010-12-04 15:23:54 -08:00
danielvincent
177cc16e2f fixed the build 2010-12-04 14:26:13 -08:00
maxwell
7dce94814c fixing the invite user job 2010-12-03 22:41:16 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
danielvincent
71cae6b89f Move request mail into resque 2010-12-03 11:51:04 -08:00
maxwell
c43077d318 fixed twitter, added logging for constants, added job for local recieve 2010-12-03 11:34:42 -08:00
MrZYX
acc8803cee try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9 2010-12-03 16:33:28 +01:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
maxwell
579a288351 public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable 2010-12-02 18:48:50 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
c76f38ca23 Write webfinger job for search 2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5 Add first resque job 2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 2010-12-02 12:35:26 -08:00
maxwell
be00a2f1b3 webfingering is now syncrounous 2010-12-02 12:35:25 -08:00
maxwell
119599bfeb Revert "Commented-on posts bubble up to the top" 
This reverts commit 6da410079b.
 2010-12-02 09:51:26 -08:00
Sarah Mei
ef89d49b1a Revert "Added some specs for grammatical_gender (User model and Users controller)." 
This reverts commit 1295417224.
 2010-12-01 22:29:19 -08:00
Raphael
6da410079b Commented-on posts bubble up to the top 2010-12-01 15:38:56 -08:00
Raphael
199eb8945d clean up posting spec, move socket_to_uid into add_to_streams 2010-12-01 15:38:56 -08:00
Raphael
836b5685f7 Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post 2010-12-01 15:38:56 -08:00
Raphael
e63a29be64 Change v_aspect_ids to prune_aspect_ids 2010-12-01 15:38:55 -08:00
maxwell
7fc9d239b9 you can no longer send a request to yourself at the Request model level 2010-12-01 11:37:54 -08:00
Hexagon
5651ea1d33 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations 2010-12-01 19:13:39 +01:00
Paweł Wilk
1295417224 Added some specs for grammatical_gender (User model and Users controller). 2010-12-01 18:19:48 +01:00
Josh Lubaway
ecd1d2ecd6 Bug #624 Can't unset birthday 
This change allows users to "unset" their birthday.

Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.

Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
 2010-11-30 21:23:47 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
maxwell
4ef7c4d6d1 make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored. 2010-11-29 13:39:48 -08:00
Sarah Mei
5ae8a06016 unpendingify comment specs 2010-11-28 17:16:22 -08:00
danielvincent
c35be73978 added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive) 2010-11-28 18:51:27 -05:00
danielvincent
05174436c0 comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner). 2010-11-28 18:51:27 -05:00
Raphael
4e15745170 Add spec to comment 2010-11-28 00:55:20 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
zhitomirskiyi
ebaf2c081e returning nothing on empty query and limit the returning of the query to 90 2010-11-23 10:02:01 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
danielvincent
9a18b7e6f3 photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level. 2010-11-22 00:32:46 -08:00
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
Raphael
d5a4de58b3 User#post is now like a future controller, Photo#instantiate no longer saves 2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc Move post dispatching to dispatch_post 2010-11-02 19:16:02 -07:00
maxwell
0ecc27a935 MS IZ posts should now update 2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc MS IZ setting the diaspora handle in photo instantiate 2010-11-02 18:32:02 -07:00
Raphael
ab4e3a9f7f add a couple specs to album_spec 2010-11-02 18:16:14 -07:00
danielvincent
bf12dc6bc7 fix spec 2010-11-02 17:44:13 -07:00
maxwell
1951df8d9c Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:49:54 -07:00
maxwell
3baa8b4552 IZ MS two pending photo specs now pass 2010-11-02 16:49:40 -07:00
danielvincent
e9f3efea79 person searchable by diaspora_handle 2010-11-02 16:48:58 -07:00
maxwell
8c89f8d87a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:42:52 -07:00
Raphael
20d5daafbc Two pending specs on photo serialization for Max and Ilya 2010-11-02 16:41:53 -07:00
Raphael
15ecc22130 Unpending user spec 2010-11-02 16:41:31 -07:00
Raphael
2c903ea519 check that User#build does not save a Person 2010-11-02 16:28:55 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
maxwell
34f190ce75 MS IZ added a check for person in webfinger response in receive_salmon method 2010-11-02 16:10:17 -07:00
maxwell
3251b8ba2e MS IZ fixed a hole where another user could update another friends post 2010-11-02 13:58:27 -07:00
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
0b8425cbde user.aspect is gone 2010-11-02 11:02:08 -07:00
Raphael
c031416ca8 Merge branch 'master' into HEAD 
Conflicts:
	lib/diaspora/user/receiving.rb
	pkg/ubuntu/dist
 2010-11-02 10:54:37 -07:00
Sarah Mei
dc97c852f4 Person delegates first_name and last_name to profile. 2010-11-01 22:22:15 -07:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
danielvincent
f6b4be97a3 requests are almost there 2010-11-01 14:54:40 -07:00
Raphael
6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit' 
Conflicts:
	app/models/user.rb
 2010-11-01 11:00:02 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Derrick Camerino
b19cdf2e25 fixing N socketing bug 2010-10-31 03:15:58 -07:00
Raphael
05cd57b02c Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 16:56:40 -07:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
danielvincent
5a9bfa7405 DG IZ; post senders are now verified by diaspora handles 2010-10-29 16:49:59 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd mocking 2010-10-29 16:21:39 -07:00
Raphael
581985990c Delete no-longer-relevant spec, now down to master branch failures 2010-10-29 15:59:42 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
Raphael
ce805c8167 Test pollution from locale being set 2010-10-29 13:26:54 -07:00
maxwell
f75bd6bc2e whoops, taking out queue stuff untill i finish 2010-10-29 13:05:35 -07:00
maxwell
a7b3fc48ec https is now a valid url for people. thx grippi 2010-10-29 12:30:38 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
6d139ab946 more tests pass 2010-10-29 11:17:39 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
68a44af856 making a few more cleanup and tests 2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
9a2e3ef158 making a few more cleanup and tests 2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38:17 -07:00
Sarah Mei
14fedf5369 GAHHH STOP EMAILING ME (specs pass) 
Also, added attr_protected to Photo#person and Photo#person_id.
 2010-10-29 00:59:26 -07:00
Justin Wienckowski
cdcb693c95 Issue #446: Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name 2010-10-28 21:12:36 -07:00
Raphael
f1ae95fac9 443- patch trim on validation + spec 2010-10-28 20:03:49 -07:00
zhitomirskiyi
3fc5651e9d Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 17:03:14 -07:00
zhitomirskiyi
f5d54ff6f8 another silly malicious friend spec 2010-10-28 17:02:55 -07:00
Raphael
512f40eac2 attr_accessible on Post 2010-10-28 15:50:19 -07:00
Raphael
f7d2665950 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 14:29:40 -07:00
Raphael
4aaa921121 A couple specs for create overwriting users 2010-10-28 14:26:20 -07:00
zhitomirskiyi
55b38585d6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 12:13:50 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -07:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00