diaspora/app/controllers
MrZYX 98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
2011-02-24 00:33:34 +01:00
..
admins_controller.rb Minimal fix to admins_controller.rb 2011-02-19 04:49:05 -08:00
application_controller.rb Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 2011-02-24 00:33:34 +01:00
aspect_memberships_controller.rb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
aspects_controller.rb remeber sort order 2011-02-19 17:06:26 +01:00
comments_controller.rb log character counts of status messages and comments 2011-02-13 00:17:34 -08:00
contacts_controller.rb default scope on contact 2011-02-18 17:38:02 -08:00
home_controller.rb toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
invitations_controller.rb removed person can't be blank error message 2011-02-11 16:29:19 -08:00
notifications_controller.rb Fixed notifications time-ago calculation 2011-02-20 05:13:34 -02:00
people_controller.rb default scope on contact 2011-02-18 17:38:02 -08:00
photos_controller.rb remove mongomapper error handler in photos_controller#create 2011-02-22 22:02:58 -08:00
posts_controller.rb Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 2011-02-24 00:33:34 +01:00
profiles_controller.rb wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
publics_controller.rb Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 2011-02-24 00:33:34 +01:00
registrations_controller.rb removed person can't be blank error message 2011-02-11 16:29:19 -08:00
requests_controller.rb Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
services_controller.rb Revert "refactored local person person friend finder functionality to use the partial" 2011-02-08 16:40:33 -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 MS IZ added spec from admin page, moved it to its own controller where it belongs 2011-02-18 11:35:24 -08:00
status_messages_controller.rb fixing debugging statement in smcontroller, also fix the spec 2011-02-22 22:38:23 -08:00
users_controller.rb Update locale before loading flash notice on user language update 2011-02-19 02:25:03 -02:00