Commit graph

341 commits

Author SHA1 Message Date
ilya
22910ef4ce Check retraction signature on person retraction 2010-08-13 19:09:55 -07:00
ilya
99c8869b8f Removing a friend now deletes them from the group(s) they are in 2010-08-13 18:56:33 -07:00
ilya
ac40f7974e RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend 2010-08-13 18:37:09 -07:00
ilya
bd271b7bec RS, IZ; Refactored the user unfriend and unfriended_by 2010-08-13 17:33:26 -07:00
ilya
7bd1193c5e RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions 2010-08-13 11:19:20 -07:00
ilya
1fcb033b68 RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass 2010-08-13 10:55:18 -07:00
ilya
23fc799b4d Turning up logging on friend request receive 2010-08-13 10:04:33 -07:00
ilya
3d57fb7f78 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-13 09:47:29 -07:00
ilya
5e33de7e56 unfriended method in the user 2010-08-13 09:47:08 -07:00
danielvincent
64c7a87aeb removed two bogus lines from user.receive 2010-08-13 08:57:22 -07:00
danielvincent
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
ilya
26bebbe393 MS IZ changing it back 2010-08-12 10:04:56 -07:00
ilya
352b9f65e0 MS IZ unfriending maybe works 2010-08-11 20:23:28 -07:00
ilya
283b4a40b5 IZ MS tests now pass 2010-08-11 17:51:46 -07:00
ilya
b0455b9532 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 17:45:13 -07:00
ilya
dd3fb1677b MS IZ continuiung to squash failing tests 2010-08-11 17:44:43 -07:00
Raphael
a19e29f2c2 RS, DG; Album.mine_or_friends actually fixed 2010-08-11 17:33:37 -07:00
Raphael
3d46a49b97 RS, DG; fixing Album.mine_or_friends 2010-08-11 16:50:22 -07:00
Raphael
cf5476f601 RS, DG; stop crashing trying to socket albums 2010-08-11 16:40:08 -07:00
Raphael
ab25e35a71 Comment guids now serialize 2010-08-11 16:31:12 -07:00
Raphael
d8959326d5 RS, DG; unsocketing is back in 2010-08-11 16:24:05 -07:00
Raphael
4b5071ec05 DG, RS; socketing back in for your own posts 2010-08-11 16:12:55 -07:00
Raphael
2d14f64745 RS, DG; Socketing moved to user 2010-08-11 16:10:27 -07:00
Raphael
0907d7a9fd RS, DG; Cleaned up the switch in user.receive 2010-08-11 16:01:16 -07:00
Raphael
bee71c5a23 RS, DG; All saving moved to user 2010-08-11 15:22:06 -07:00
Raphael
c6a620c7dd RS, DG; store_from_xml is gone, use user.receive 2010-08-11 15:05:05 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -07:00
Raphael
d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
	spec/controllers/publics_controller_spec.rb
2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7 build_xml_for is no longer static, we should probably change the name 2010-08-11 13:58:18 -07:00
ilya
29b1217fcd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4 MS IZ testing many the friend request user methods 2010-08-11 12:28:48 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
144e9ed439 Bookmarks now clean link in instantiate, posting them should work right again 2010-08-11 11:18:40 -07:00
maxwell
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
maxwell
b9718c079b Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:05:10 -07:00
maxwell
8a3eb9f6cf IZ MS one last receive url...i think... 2010-08-10 16:04:08 -07:00
Raphael
a9ebe44b1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
maxwell
89c54d1a63 MS IZ receive url in the request and a slash in person 2010-08-10 15:56:34 -07:00
Raphael
8b9cd3453d RS, DG; User.instatntiate simplified 2010-08-10 15:44:14 -07:00
maxwell
432ce02a14 MS IZ receive url is better 2010-08-10 15:35:40 -07:00
Raphael
a8b77cf868 DG RS; made an instantiate method for user which makes a person and profile 2010-08-10 15:35:27 -07:00
maxwell
da4de20ce1 IZ MS made things push to the receive url 2010-08-10 15:24:51 -07:00
maxwell
487de2d865 MS IZ receive, not recieve 2010-08-10 15:17:12 -07:00
maxwell
7ff25ef81a MS IZ saved the person model 2010-08-10 15:10:11 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
aa1f892c35 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 12:27:02 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -07:00