Commit Graph

54 Commits

Author SHA1 Message Date
Javier Martín
f2ef27d3ae Always set Globalize.locale after I18n.locale.
The test "Budget Investments Show milestones" was failing in certain
cases where `Globalize.locale` had been changed in a previous test.

Since having different values in `Globalize.locale` and `I18n.locale`
has proven to be an issue on the test enviroment, this commit also
changes application code in order to avoid similar situations on
production.

See issue #2718.
2018-07-03 00:52:20 +02:00
María Checa
1169c10907 Add condition to show only selected investments in publishing_prices phase 2018-05-29 08:40:32 -04:00
rgarcia
be554a629c Make current_budget accessible in controller and views 2018-01-15 19:13:45 +01:00
rgarcia
c0488c3b3c refactors investment filters 2017-05-06 04:57:06 +02:00
kikito
9ac6e2d60b Uses invisible_captcha's default "foo fast" action 2016-04-28 12:47:04 +02:00
kikito
7adc706d23 Moves redirect_timestamp_spam to AppController 2016-04-27 16:13:49 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
kikito
6ba1db1a02 includes a "cancel" option when logging in via omniauth
restores missing proposal in common_actions
2016-02-03 11:59:19 +01:00
kikito
1e8d46d83a fixes failing email specs
Conflicts:
	app/models/user.rb

fixes missing i18n entry

fixes badly done merge

fixes i18n issues

force build to start
2016-01-26 18:15:43 +01:00
kikito
981e82fb4d Refactors ensure_signup_complete action 2016-01-26 18:11:04 +01:00
Josep Jaume Rey Peroy
f9b6284df6 Explicitly check for different locale before updating 2016-01-22 18:26:08 +01:00
Josep Jaume Rey Peroy
cf00f12ec7 Store locale in a user's field and switch locale on mailers 2016-01-22 18:10:28 +01:00
rgarcia
b5e9113718 merges activities into notifications 2016-01-06 12:33:37 +01:00
Julian Herrero
d9ba3edc2a mostrar notificaciones a los usuarios cuando alguien comenta en su
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
Julian Herrero
ba0ce4e14b añadir track_activity para mostrar futuras notificaciones a los usuarios 2016-01-05 17:42:10 +01:00
kikito
866e04f776 makes devise remember the last visited page before login in 2015-12-21 16:44:30 +01:00
kikito
7996f5f816 makes cancan return a json error when asked for json and permissions fail 2015-12-16 14:02:03 +01:00
Juanjo Bazán
1e0ac137bb removes beta testers functionality 2015-10-29 13:19:00 +01:00
rgarcia
c71bf4c876 tracks visits from different email templates 2015-10-22 12:23:15 +02:00
kikito
18db6482f9 makes sure verifications only happen for signed in users when doing a letter verification 2015-10-20 17:18:28 +02:00
kikito
0d0806c9ae improvements in the letter verification error messages 2015-10-20 16:19:17 +02:00
kikito
1caf6348a9 Extract HasOrders + partial from DebatesController 2015-09-12 16:48:41 +02:00
rgarcia
f2b917d486 adds proposal show 2015-09-12 12:30:20 +02:00
Juanjo Bazán
f517d7f410 adds before action for verified users 2015-09-11 16:44:52 +02:00
rgarcia
abc68dc868 refactors lock tries [#279] 2015-09-10 20:26:49 +02:00
kikito
e9dc0d54cd uses secrets variable to decide when to use http_auth 2015-09-06 18:36:31 +02:00
rgarcia
afea21c2bc fixes exception when not logged in 2015-09-06 11:26:15 +02:00
rgarcia
ae0ad77197 reorders before_actions 2015-09-03 01:28:46 +02:00
Juanjo Bazán
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
2015-09-02 14:24:06 +02:00
kikito
ebacc8c9c7 Uses has_filters in all controllers with filters & renames @filter to @current_filter 2015-09-02 13:21:46 +02:00
rgarcia
abfc93ea78 hot fix to take into account preproduction 2015-09-02 11:36:30 +02:00
rgarcia
c1e85d7894 updates http_basic keys 2015-09-01 20:05:47 +02:00
kikito
99fd0a917d Uses @comment_flags in everything comment-related 2015-09-01 13:10:19 +02:00
kikito
9a071d2ed7 Renames @voted_values to @debate_votes in controllers 2015-09-01 13:07:03 +02:00
rgarcia
f6294a6450 hot fixes parsing of beta testers file 2015-08-31 13:32:49 +02:00
rgarcia
092dbb56c9 adds translations 2015-08-29 16:06:30 +02:00
rgarcia
f92b6de22d authenticates beta testers in beta site 2015-08-29 15:48:03 +02:00
rgarcia
fe9586bc29 adds password protection for staging and production servers 2015-08-28 17:27:14 +02:00
rgarcia
07180bcd04 adds residence verification 2015-08-27 23:53:49 +02:00
David Gil
158e203936 adds omniauth basic authentication process with Twitter, including an intermediate step to ask the user for her email if not provided by the OAuth provider - Twitter, for instance 2015-08-24 20:24:54 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
kikito
30e738a2fe Add cancan authorization in all main urls 2015-08-10 14:59:42 +02:00
rgarcia
a949d54a85 removes unused json respond block [#77] 2015-08-07 21:52:14 +02:00
kikito
dac5b8d22a Make /admin and /moderation only accesible to Admins & Moderators 2015-08-07 19:15:08 +02:00
rgarcia
515d083633 use custom layout for devise controllers 2015-08-06 16:01:01 +02:00
Fernando Seror
c4eb29f99d Merge branch 'master' into escoger_idioma_803
Conflicts:
	app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00