kikito b28f63b016 merges master and fixes conflicts

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

..

admin

merges master and fixes conflicts

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

api

fixes specs and makes stats for admins eyes only

2015-08-17 22:00:54 +02:00

concerns

initial commit

2015-07-15 13:32:13 +02:00

moderation

merges master and fixes conflicts

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

organizations

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

users

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

account_controller.rb

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

application_controller.rb

fixes spacing

2015-08-16 22:45:43 +02:00

comments_controller.rb

adds moderation to comments and debates [#136]

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

debates_controller.rb

Fix conflicts

2015-08-17 21:08:15 +02:00

stats_controller.rb

adds admin verification to view stats

2015-08-17 22:30:24 +02:00

welcome_controller.rb

refactors voted debates

2015-08-15 14:57:41 +02:00