Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" ... This reverts commit fb70dc8c99, reversing changes made to 53fef63a9a. Conflicts: pkg/fedora/diaspora-setup pkg/ubuntu/diaspora-setup public/stylesheets/sass/application.sass spec/models/user/attack_vectors_spec.rb		2010-10-20 14:59:55 +02: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	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-15 17:20:19 -07:00
aspects_controller.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02: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	invite sends friend request if already friends, and raises if already friends	2010-10-18 16:27:02 -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	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
requests_controller.rb	flash error on friending self	2010-10-18 12:11:32 -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	moved fb posting into the user model	2010-10-18 14:50:48 -07:00
users_controller.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00