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

..

custom

Custom folder structure: initial documentation, code and structure folders

2016-05-31 19:57:29 +02:00

activemodel.en.yml

Adds new english translations

2015-10-28 12:42:31 +01:00

activemodel.es.yml

Standardizes yml files format

2015-10-28 12:47:51 +01:00

activerecord.en.yml

generic message for max_per_day setting

2016-06-16 15:54:19 +02:00

activerecord.es.yml

generic message for max_per_day setting

2016-06-16 15:54:19 +02:00

admin.en.yml

adds missing translation

2016-06-16 18:20:14 +02:00

admin.es.yml

adds missing translation

2016-06-16 18:20:14 +02:00

devise_views.en.yml

Removes Madrid from translations

2016-07-04 18:06:51 +02:00

devise_views.es.yml

Removes Madrid from translations

2016-07-04 18:06:51 +02:00

devise.en.yml

Removes Madrid from translations

2016-07-04 18:06:51 +02:00

devise.es.yml

Removes Madrid from translations

2016-07-04 18:06:51 +02:00

en.yml

Merge branch 'master' into voting-proposals

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

es.yml

Merge branch 'master' into voting-proposals

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

kaminari.en.yml

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

kaminari.es.yml

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

mailers.en.yml

Changes references to Madrid

2016-07-05 13:47:14 +02:00

mailers.es.yml

Changes references to Madrid

2016-07-05 13:47:14 +02:00

management.en.yml

Changes .com urls examples to .consul

2016-07-06 12:32:07 +02:00

management.es.yml

Changes .com urls examples to .consul

2016-07-06 12:32:07 +02:00

moderation.en.yml

normalizes i18n keys

2016-01-16 18:40:24 +01:00

moderation.es.yml

normalizes i18n keys

2016-01-16 18:40:24 +01:00

pages.en.yml

Changes references to Madrid

2016-07-05 13:47:14 +02:00

pages.es.yml

fixes a few typos

2016-09-06 18:21:15 +02:00

rails.en.yml

changes how comment.created_at is shown

2015-09-09 14:57:27 +02:00

rails.es.yml

changes how comment.created_at is shown

2015-09-09 14:57:27 +02:00

responders.en.yml

adds direct messages

2016-06-08 20:44:54 +02:00

responders.es.yml

adds direct messages

2016-06-08 20:44:54 +02:00

settings.en.yml

Adds admin setting 'months to archive proposals'

2016-09-09 18:02:02 +02:00

settings.es.yml

Adds admin setting 'months to archive proposals'

2016-09-09 18:02:02 +02:00

social_share_button.en.yml

Standardizes yml files format

2015-10-28 12:47:51 +01:00

social_share_button.es.yml

Standardizes yml files format

2015-10-28 12:47:51 +01:00

valuation.en.yml

adds radio to mark feasibility as undefined (nil)

2016-03-09 12:37:22 +01:00

valuation.es.yml

adds radio to mark feasibility as undefined (nil)

2016-03-09 12:37:22 +01:00

verification.en.yml

Changes .com urls examples to .consul

2016-07-06 12:32:07 +02:00

verification.es.yml

Changes .com urls examples to .consul

2016-07-06 12:32:07 +02:00