Juanjo Bazán 7e1cd2940d Fix conflicts

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

..

abilities_helper.rb

adds moderation to comments and debates [#136]

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

admin_helper.rb

updates options for admin officials level

2015-08-17 18:27:18 +02:00

application_helper.rb

move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link

2015-08-12 16:26:41 +02:00

comments_helper.rb

adds i18n to comments_helper

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

stats_helper.rb

Show charts using c3.js

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

votes_helper.rb

refactors votes view code to helper

2015-08-07 09:19:02 +02:00