kikito b28f63b016 merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

..

base_controller.rb

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

comments_controller.rb

adds moderation to comments and debates [#136]

2015-08-17 13:39:31 +02:00

dashboard_controller.rb

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

debates_controller.rb

adds moderation to comments and debates [#136]

2015-08-17 13:39:31 +02:00

officials_controller.rb

adds edition/management of officials to admin zone

2015-08-17 17:04:29 +02:00

organizations_controller.rb

adds filters to admin/organizations

2015-08-17 14:25:43 +02:00

settings_controller.rb

adds settings area to admin

2015-08-17 18:38:57 +02:00

tags_controller.rb

removes layout from admin tags controller

2015-08-17 15:22:50 +02:00