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

..

album.rb

Add or later to license notice

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

aspect.rb

Attr-accessible on aspects, check whether built user is persisted

2010-10-21 12:49:50 -07:00

comment.rb

Add or later to license notice

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

person.rb

added tests to make sure Person.by_webfinger only returns exact matches

2010-10-22 16:28:03 -07:00

photo.rb

Add or later to license notice

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

post.rb

Revert "Revert "Merge remote branch 'upstream/master'""

2010-10-20 09:51:55 -07:00

profile.rb

removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).

2010-10-26 13:04:47 -07:00

request.rb

MS IZ got rid of the requests for me scope in the user

2010-10-26 14:49:37 -07:00

retraction.rb

Add or later to license notice

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

service.rb

OmniauthService -> Service. Cleaned up views.

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

status_message.rb

status message length is limited to 1000 chars.

2010-10-22 17:42:59 -07:00

user.rb

Merge branch 'master' into getting-started

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