rgarcia dde1d34172 fixes conflicts with master

2017-01-05 01:56:35 +01:00

..

acts_as_taggable_on.rb

Merge branch 'master' into budget

2016-11-28 11:41:49 +01:00

ahoy.rb

removes geocoding from ahoy

2015-11-03 16:11:09 +01:00

assets.rb

Tries to make ckeditor work correctly with the asset pipeline

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

backtrace_silencers.rb

…

ckeditor.rb

adds ckeditor config

2016-08-29 16:49:52 +02:00

cookies_serializer.rb

…

delayed_job_config.rb

increase delayed job max run time to 30 minutes

2016-12-28 11:41:41 +01:00

devise_async.rb

…

devise_security_extension.rb

expired password last

2016-10-06 14:19:48 +02:00

devise.rb

Don't fetch setting if table doesn't exist

2017-01-04 13:37:55 +01:00

filter_parameter_logging.rb

…

foundation_rails_helper.rb

monkeypatches foundation_rails_helper so it shows an error div after ckeditor

2015-09-09 18:36:03 +02:00

i18n_backend.rb

removes i18n memorization for development env

2015-12-18 17:47:22 +01:00

inflections.rb

…

invisible_captcha.rb

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

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

kaminari_config.rb

fixes kaminari inability to pluralize spanish names

2015-09-12 18:39:29 +02:00

mime_types.rb

…

rollbar.rb

fixes typo

2015-09-06 13:42:31 +02:00

session_store.rb

changes 'participacion' to 'consul' in config

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

social_share_button.rb

…

tolk.rb

Adds Tolk gem for i18n web interface

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

vote_extensions.rb

Merge branch 'master' into budgets

2016-12-27 14:02:12 +01:00

wrap_parameters.rb

…