Commit graph

4 commits

Author SHA1 Message Date
Stella Rouzi
17ebad413e base controller
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Ancor Gonzalez Sosa
c6956482f0 Speaker can be changed in admin/conference/x/events 2013-07-11 09:04:54 +02:00