nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
Raphael 950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
2010-09-24 14:36:00 -07:00
..
albums_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
application_controller.rb DG IZ; cleanup 2010-09-22 15:48:50 -07:00
aspects_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
comments_controller.rb query for post through user 2010-09-23 10:17:13 -07:00
dev_utilities_controller.rb DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
people_controller.rb DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
photos_controller.rb Merge branch '1.9.2' into HEAD 2010-09-24 14:36:00 -07:00
publics_controller.rb Merge branch 'master' into HEAD 2010-09-24 09:15:10 -07:00
registrations_controller.rb Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
requests_controller.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:39:04 -07:00
sockets_controller.rb Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
status_messages_controller.rb DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
users_controller.rb DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00