Alberto Garcia Cabeza 910b24936d Merge branch 'master' into voting-proposals ...

Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb

2016-09-15 13:58:53 +02:00

..

_actions.html.erb

adds proposal show

2015-09-12 12:30:20 +02:00

_categories.html.erb

Improves styles for districts map page

2016-01-26 13:28:33 +01:00

_comments.html.erb

Adds notification menu and message for empty notifications

2016-06-15 21:00:56 +02:00

_featured_proposal.html.erb

adjusts style for badge in featured proposals

2016-09-07 13:22:52 +02:00

_featured_votes.html.erb

Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul

2016-04-04 20:56:29 +02:00

_filter_subnav.html.erb

Adds tabs for notifications on proposal show

2016-06-06 17:26:48 +02:00

_flag_actions.html.erb

Replaces icons i tags for span

2016-03-14 19:32:48 +01:00

_form.html.erb

Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile

2016-04-27 16:07:48 +02:00

_geozones.html.erb

Adds alternative text for sidebar map

2016-05-04 11:49:30 +02:00

_notifications.html.erb

Adds notification menu and message for empty notifications

2016-06-15 21:00:56 +02:00

_popular.html.erb

Changes path for proposals summary

2016-02-17 14:44:37 +01:00

_proposal_ballots_banner.html.erb

Moves banner to a partial and includes it on debates index

2016-09-14 11:09:36 +02:00

_proposal.html.erb

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

_refresh_flag_actions.js.erb

Enables flagging proposals

2015-09-13 12:59:12 +02:00

_retired.html.erb

removes unused css class

2016-04-25 18:12:40 +02:00

_votes.html.erb

Includes aria hidden attribute on support buttons

2016-05-04 15:21:20 +02:00

edit.html.erb

Moves back links inside a partial

2016-04-26 13:04:57 +02:00

index.html.erb

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

map.html.erb

Improves styles for districts map page

2016-01-26 13:28:33 +01:00

new.html.erb

Moves back links inside a partial

2016-04-26 13:04:57 +02:00

retire_form.html.erb

Improves styles for retire proposals

2016-04-23 13:28:43 +02:00

show.html.erb

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

suggest.js.erb

removes duplication between debate and proposal suggestions

2016-02-03 19:57:37 +01:00

summary.html.erb

Displays badge for official positions

2016-06-20 21:37:25 +02:00

vote_featured.js.erb

adds featured proposals

2015-10-22 11:54:17 +02:00

vote.js.erb

adds proposal votes

2015-09-13 21:56:52 +02:00