MaiteHdezRivas 5dd4633d6a Merge branch 'suggest_before_creating' ...

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb

2016-01-27 13:11:23 +01:00

..

_actions.html.erb

Adds test for not showing moderator actions in own debate

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

_comments.html.erb

Refactor comment tree calculation using a PORO

2015-10-30 17:00:32 +01:00

_debate.html.erb

Uses the new field, erased_at, for erased users

2015-10-21 14:28:21 +02:00

_featured_debates_static.html.erb

Improves styles for featured debates

2016-01-12 15:51:13 +01:00

_flag_actions.html.erb

Fixes add flags on mobile devices

2015-09-12 18:05:33 +02:00

_form.html.erb

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

_refresh_flag_actions.js.erb

Several renamings

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

_votes.html.erb

makes percentage votes to sum 100

2015-09-15 14:11:12 +02:00

edit.html.erb

Improves styles for debates

2015-09-03 14:15:45 +02:00

index.html.erb

cleans up

2016-01-26 12:13:29 +01:00

map.html.erb

uses geozones instead of district tags

2016-01-25 22:28:46 +01:00

new.html.erb

Updates some texts

2015-11-15 21:08:52 +01:00

show.html.erb

Removes unused classes

2015-12-16 11:58:36 +01:00

suggest.html.erb

adding suggest with coffescript

2016-01-27 12:32:44 +01:00

vote.js.erb

fixes conflicts

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