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

301 commits

Author SHA1 Message Date
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7 Tests pass again, use id => in retraction.perform 2010-09-09 18:15:30 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
fd61535e11 Hcards working 2010-09-09 15:43:16 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
Raphael
831609ad15 Make a stranger that you receive a comment from visible 2010-08-27 10:19:10 -07:00
Raphael
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
Raphael
3ed191e972 MS IZ testing on remote 2010-08-26 16:27:01 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
Raphael
a29a1bec3e Add some logging to comments 2010-08-26 11:07:26 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
Raphael
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -07:00
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
Raphael
41aa8ed10e Specs pass again, need to make albums have a group 2010-08-24 17:12:27 -07:00
Raphael
c102e81b03 put the visible back in 2010-08-24 16:56:04 -07:00
maxwell
68bd5bf5f5 MS merging in master again 2010-08-24 16:21:20 -07:00
Raphael
abafa03e92 Spec for posting to no group 2010-08-24 15:48:51 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
maxwell
f5316fb3c1 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-08-24 14:45:04 -07:00
maxwell
4f63f60b03 MS merging, and added a dumb check for the email validating twice 2010-08-24 14:03:57 -07:00
maxwell
2c9a1e3a43 added wall spec 2010-08-24 13:47:58 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
Raphael
511f571ae5 Specs mostly pass again 2010-08-23 15:01:39 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
Raphael
364cdfed22 Allowed email checking no longer so ridiculous 2010-08-23 10:20:19 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
Raphael
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
ilya
76b4b55e98 Added spec for remote photo url setting to photos 2010-08-18 17:39:38 -07:00
Raphael
5a2b42e4e5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
Raphael
39c96bfd04 Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
ilya
1ab21fe8b1 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 15:25:23 -07:00
ilya
08739ad23d DG IZ; retractions remove post references in group objects 2010-08-18 15:23:46 -07:00
Raphael
61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 14:45:41 -07:00
Raphael
f570199d17 Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly 2010-08-18 14:30:16 -07:00
ilya
034755368b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-18 12:17:23 -07:00
Raphael
10aef7a0a3 Begin rescue on publics controller to make the post for nonexistent user error more readable 2010-08-18 11:46:28 -07:00
ilya
4d86933f4a DG IZ; user's visible posts method queries group objects for their posts 2010-08-18 11:40:02 -07:00
ilya
055c222fc2 DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial 2010-08-18 10:53:43 -07:00
ilya
b0088c73d8 DG IZ; user's own post gets referenced in group model 2010-08-18 10:37:33 -07:00
Raphael
b99a86e6bd Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
 2010-08-18 10:10:20 -07:00
Raphael
539316a235 Removing posts relation from person 2010-08-17 23:50:07 -07:00
ilya
501bcdd197 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 23:25:33 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
ilya
55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
 2010-08-17 22:58:46 -07:00
Raphael
7c75a54d90 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 22:34:21 -07:00
Raphael
cb152ea3c3 Shortened user receive, moderated groups.first in the socketing 2010-08-17 22:34:01 -07:00
ilya
9ee10450c4 removing traces of bookmarks and blogs from specs 2010-08-17 22:32:13 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
1d6e132a9f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 13:07:26 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
ilya
2a90e59f1e DG IZ the group should view the posts for the group (and yourself) w 2010-08-17 12:22:14 -07:00
ilya
2af41a0ea9 DG IZ; posts_for :group method in User 2010-08-17 12:14:02 -07:00
ilya
0af6f7b0e5 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:48:47 -07:00
ilya
a9c9619a54 DG IZ; posting from a user includes adding to the many posts association in said user 2010-08-17 10:43:18 -07:00
Raphael
cba0f5477c spec for by_webfinger... after the fact 2010-08-17 10:41:01 -07:00
Raphael
e32315b6c6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281 Moved search specs, renamed method 2010-08-17 10:24:59 -07:00
danielvincent
7e5ace7cbc minor cleanup in models 2010-08-16 22:44:22 -07:00
ilya
1d92d11841 DG IZ; user refs are incremented as well as decremented for Posts 2010-08-16 20:39:24 -07:00
ilya
74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
	spec/lib/diaspora_parser_spec.rb
 2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -07:00
Raphael
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
Raphael
ad07521e07 Made a few more tests pass 2010-08-16 16:22:46 -07:00
Raphael
3efa36587a Took out a bunch of user.owner references 2010-08-16 11:01:58 -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
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
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
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
ilya
dd3fb1677b MS IZ continuiung to squash failing tests 2010-08-11 17:44:43 -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
5228e51262 RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated. 2010-08-11 14:40:48 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -07:00
Raphael
e94faf89bb Finishing moving to dynamic build_xml_for 2010-08-11 14:05:57 -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
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
Raphael
8b9cd3453d RS, DG; User.instatntiate simplified 2010-08-10 15:44:14 -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
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00