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
..
user	Shortened user receive, moderated groups.first in the socketing	2010-08-17 22:34:01 -07:00
album_spec.rb	DG MS; fixed album specs	2010-08-05 12:00:23 -07:00
comments_spec.rb	Made a few more tests pass	2010-08-16 16:22:46 -07:00
group_spec.rb	RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>	2010-08-10 11:02:04 -07:00
person_spec.rb	removing traces of bookmarks and blogs from specs	2010-08-17 22:32:13 -07:00
photo_spec.rb	Encryption removed from callbacks, except retractions sort of. verification is in user.receive	2010-08-16 17:23:54 -07:00
post_spec.rb	removing traces of bookmarks and blogs from specs	2010-08-17 22:32:13 -07:00
profile_spec.rb	Fixed the tests;	2010-07-28 16:50:38 -07:00
request_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 22:58:46 -07:00
retraction_spec.rb	MS IZ continuiung to squash failing tests	2010-08-11 17:44:43 -07:00
status_message_spec.rb	MS DG; 19 failing specs left	2010-08-05 17:16:51 -07:00
user_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 22:58:46 -07:00