maxwell c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: lib/diaspora/user/receiving.rb		2010-11-02 12:46:08 -07:00
..
user	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-02 12:46:08 -07:00
album_spec.rb	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
aspect_spec.rb	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
comment_spec.rb	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
contact_spec.rb	Moving friendships into a 'Contact' proxy object.	2010-10-22 18:11:04 -07:00
person_spec.rb	Person delegates first_name and last_name to profile.	2010-11-01 22:22:15 -07:00
photo_spec.rb	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
post_spec.rb	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
profile_spec.rb	MS IZ everything now uses diaspora handle. this feels so good	2010-11-01 18:42:42 -07:00
request_spec.rb	requests are almost there	2010-11-01 14:54:40 -07:00
retraction_spec.rb	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
status_message_spec.rb	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
user_spec.rb	Merge remote branch 'jwinky/446-user-name-length-limit'	2010-11-01 11:00:02 -07:00