maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: app/controllers/publics_controller.rb app/models/user.rb		2010-08-09 17:31:46 -07:00
..
controllers	Going toward pending requests	2010-08-09 17:21:41 -07:00
fixtures	RS, IZ; extracted and murdered ostatus.	2010-08-04 16:00:01 -07:00
helpers	RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?	2010-08-06 11:52:33 -07:00
lib	RS, DG; Websocket is now working again, users have a channel	2010-08-09 13:02:08 -07:00
models	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
factories.rb	User factory now works	2010-08-06 13:27:42 -07:00
misc_spec.rb	User factory now works	2010-08-06 13:27:42 -07:00
spec_helper.rb	Refactored message_queue getting, fixed retraction spec	2010-08-06 13:13:00 -07:00
user_encryption_spec.rb	DG, RS; User person delegation fixed	2010-08-09 10:46:02 -07:00