zhitomirskiyi 21e3c2ae73 Merge branch 'open-aspects' ... Conflicts: app/controllers/aspects_controller.rb app/controllers/home_controller.rb app/helpers/application_helper.rb db/migrate/20110201013408_add_open_aspects_to_user.rb spec/controllers/aspects_controller_spec.rb spec/controllers/home_controller_spec.rb		2011-02-01 17:32:08 -08:00
..
aspects_controller_spec.rb	now updating the open aspects in js	2011-02-01 16:58:33 -08:00
comments_controller_spec.rb	Comments controller spec using fixtures	2011-01-18 10:48:06 -08:00
home_controller_spec.rb	storing it as a boolean in the aspect	2011-02-01 17:25:15 -08:00
invitations_controller_spec.rb	facebook invitations actually work	2011-01-28 17:22:18 -08:00
notifications_controller_spec.rb	Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns	2011-01-26 18:29:23 -08:00
people_controller_spec.rb	Starting work on an autocomplete feature	2011-02-01 11:56:56 -08:00
photos_controller_spec.rb	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
posts_controller_spec.rb	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
publics_controller_spec.rb	Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns	2011-01-26 18:29:23 -08:00
registrations_controller_spec.rb
requests_controller_spec.rb	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
services_controller_spec.rb	Fix translation missing error	2011-01-28 17:50:34 -08:00
sockets_controller_spec.rb	Made specs work with fixtures, spec_helper needs work	2011-01-18 13:31:10 -08:00
statistics_controller_spec.rb	mark notification as read on the status message show page	2011-01-31 15:26:20 -08:00
status_message_controller_spec.rb	fix sm show	2011-01-31 21:50:06 -08:00
users_controller_spec.rb	storing it as a boolean in the aspect	2011-02-01 17:25:15 -08:00