maxwell 341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell ... Conflicts: Gemfile Gemfile.lock spec/models/user/invite_spec.rb		2010-10-14 23:02:06 -07:00
..
albums_controller.rb	DG MS; 404 show pages for objects that don't exist for given user	2010-10-11 11:32:20 -07:00
application_controller.rb	the invited user keeps track of who invited them, limit on invites,	2010-10-13 16:52:33 -07:00
aspects_controller.rb	DG MS; 404 show pages for objects that don't exist for given user	2010-10-11 11:32:20 -07:00
comments_controller.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
dev_utilities_controller.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
invitations_controller.rb	the invited user keeps track of who invited them, limit on invites,	2010-10-13 16:52:33 -07:00
people_controller.rb	Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion	2010-10-13 23:49:13 -07:00
photos_controller.rb	DG MS; 404 show pages for objects that don't exist for given user	2010-10-11 11:32:20 -07:00
publics_controller.rb	Make intended behavior on hcard action clearer, return 404 on nonexistent person	2010-10-11 10:13:52 -07:00
registrations_controller.rb	MS DG; basic view support; it works, but it is ugly	2010-10-13 18:42:24 -07:00
requests_controller.rb	merging	2010-10-14 16:32:37 -07:00
services_controller.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
sockets_controller.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
status_messages_controller.rb	DG MS; 404 show pages for objects that don't exist for given user	2010-10-11 11:32:20 -07:00
users_controller.rb	Merge branch 'master' of github.com:diaspora/diaspora into maxwell	2010-10-14 23:02:06 -07:00