Juanjo Bazán 358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

..

_actions.html.erb

Adds test for not showing moderator actions in own debate

2015-08-24 18:45:47 +02:00

_debate.html.erb

adds cache to _debate view

2015-08-31 20:40:48 +02:00

_flag_actions.html.erb

Replaces can? :flag/:unflag by a helper function

2015-09-01 10:34:46 +02:00

_form.html.erb

Changes and updates texts

2015-09-02 23:43:08 +02:00

_refresh_flag_actions.js.erb

Several renamings

2015-08-27 10:48:49 +02:00

_votes.html.erb

removes redundant condition

2015-09-02 12:57:09 +02:00

edit.html.erb

adds i18n to debates' interface

2015-07-28 16:48:36 +02:00

index.html.erb

Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337

2015-09-03 11:50:53 +02:00

new.html.erb

Changes and updates texts

2015-09-02 23:43:08 +02:00

show.html.erb

uses ancestry to retrieve debate comments

2015-09-03 16:32:54 +02:00

vote.js.erb

fixes conflicts

2015-08-06 13:42:57 +02:00