danielvincent 385e1673ab Merge branch 'master' into getting-started ...

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml

2010-10-26 16:50:57 -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

OmniauthService -> Service. Cleaned up views.

2010-10-25 17:41:59 -07:00

aspects_controller.rb

fixed pagination bug on aspect#show (re: #445)

2010-10-26 12:57:43 -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

invite sends friend request if already friends, and raises if already friends

2010-10-18 16:27:02 -07:00

people_controller.rb

Merge branch 'master' into getting-started

2010-10-26 16:50:57 -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

Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.

2010-10-20 11:03:47 -07:00

requests_controller.rb

Addresses [#380] and [#239] by handling the errors from bad identities

2010-10-19 23:44:43 -04:00

services_controller.rb

OmniauthService -> Service. Cleaned up views.

2010-10-25 17:41:59 -07:00

sockets_controller.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

status_messages_controller.rb

can't call match on nil

2010-10-25 22:56:50 -07:00

users_controller.rb

Merge branch 'master' into getting-started

2010-10-26 16:50:57 -07:00