diaspora/app/controllers
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
..
application_controller.rb Merge branch 'open-aspects' 2011-02-01 17:32:08 -08:00
aspects_controller.rb now updating the open aspects in js 2011-02-01 16:58:33 -08:00
comments_controller.rb everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
home_controller.rb storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00
invitations_controller.rb Job::InviteUser -> Job::InviteUserByEmail 2011-01-26 12:16:48 -08:00
notifications_controller.rb Make notifications/read_all non-ajax, link back to index page 2011-01-31 15:28:43 -08:00
people_controller.rb Correct limit on search autocomplete 2011-02-01 14:35:14 -08:00
photos_controller.rb Finished contacts of contacts for local users 2011-01-27 13:41:22 -08:00
posts_controller.rb add which_action_and_user to application_controller 2011-01-28 16:15:50 -08:00
publics_controller.rb add which_action_and_user to application_controller 2011-01-28 16:15:50 -08:00
registrations_controller.rb Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
requests_controller.rb Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
services_controller.rb fix finder controller action 2011-01-27 10:19:38 -08:00
sockets_controller.rb new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times 2011-01-05 17:43:25 -08:00
statistics_controller.rb use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
status_messages_controller.rb mark notification as read on the status message show page 2011-01-31 15:26:20 -08:00
users_controller.rb storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00