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

..

deploy

purges simple_captcha

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

environments

Changes .com urls examples to .consul

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

initializers

Tries to make ckeditor work correctly with the asset pipeline

2016-08-30 12:05:46 +02:00

locales

Merge branch 'master' into voting-proposals

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

application_custom.rb

Custom folder structure: initial documentation, code and structure folders

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

application.rb

Custom folder structure: initial documentation, code and structure folders

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

boot.rb

initial commit

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

database.yml.example

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

deploy-secrets.yml.example

Changes references to Madrid

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

deploy.rb

updates ruby version in deploy.rb to 2.3.1

2016-07-12 11:21:15 +02:00

environment.rb

initial commit

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

i18n-tasks.yml

fixes specs

2016-06-16 12:06:26 +02:00

newrelic.yml

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

routes.rb

Adds proposal ballots controller and views

2016-09-07 12:43:12 +02:00

schedule.rb

adds a dummy task to schedule.rb

2015-09-12 08:45:00 +02:00

secrets.yml.example

Adds Tolk gem for i18n web interface

2016-01-14 14:57:06 +01:00