kikito
248bff712c
fixes failing i18n specs
...
Eliminates registering_with_oauth attr_accessor
ELIMINATE
Conflicts:
app/views/users/registrations/finish_signup.html.erb
improves devise confirmation message
improves devise omniauth confirmation message
improves devise omniauth confirmation message
do not use nils on finish_signup fields
Fixes auth specs after changing the i18n
2016-01-26 18:15:36 +01:00
kikito
68e1ee2bc2
synch Gemfile.lock with master
2016-01-26 18:14:47 +01:00
kikito
62ac864d90
removes deprecated user specs
...
Conflicts:
spec/models/user_spec.rb
2016-01-26 18:14:47 +01:00
kikito
892612fe9b
Adds two new scenarios to auth specs
2016-01-26 18:14:47 +01:00
kikito
9318cd8d7e
Refactors twitter hash usage on auth specs
2016-01-26 18:14:44 +01:00
kikito
1a7ca43569
Simplifies username assignation when creating a new oauth user
2016-01-26 18:11:46 +01:00
kikito
8dcb5d2cac
Refactors self.first_or_initialize_for_oauth
2016-01-26 18:11:11 +01:00
kikito
7615dc066b
Uses registering_with_oauth persistent attribute to deactivate checks in certain occasions
2016-01-26 18:11:11 +01:00
kikito
a87669840c
Hides fields without errors in finish_signup.html.erb
...
Conflicts:
app/views/users/registrations/finish_signup.html.erb
2016-01-26 18:11:11 +01:00
kikito
c6c01fc9f2
Adds 'registering_with_oauth' boolean to users
...
Conflicts:
db/schema.rb
Changes title in finish_signup page
Conflicts:
config/locales/en.yml
config/locales/es.yml
2016-01-26 18:11:04 +01:00
kikito
91a16142bf
Refactors confirm_email & uses it in user_auth_spec
2016-01-26 18:11:04 +01:00
kikito
b71dd5767b
Adds username to the finish_signup form
...
Conflicts:
app/views/users/registrations/finish_signup.html.erb
2016-01-26 18:11:04 +01:00
kikito
f74028e3b5
Replaces the OMNIAUTH_REGEX logic with a boolean
2016-01-26 18:11:04 +01:00
kikito
981e82fb4d
Refactors ensure_signup_complete action
2016-01-26 18:11:04 +01:00
kikito
d1741a2b28
Refactor first_or_create_for_auth & its usage
...
Conflicts:
app/controllers/users/omniauth_callbacks_controller.rb
Refactors first_or_initialize_for_oauth
2016-01-26 18:10:57 +01:00
kikito
f262686023
Allows deploying branches in preproduction
...
Bundle install
2016-01-26 18:10:51 +01:00
kikito
5ea8d76903
Rename find_for_oauth param and refactor user expression
2016-01-26 18:10:50 +01:00
kikito
271146f688
Rename Identity method
...
Remove Identity method
2016-01-26 18:10:47 +01:00
Juanjo Bazán
dc23bf19b3
Merge pull request #855 from consul/districts-and-categories
...
Categories and Geozones
2016-01-26 13:55:06 +01:00
Alberto Garcia Cabeza
471f8f3530
Replaces districts map to generic image
2016-01-26 13:28:34 +01:00
Alberto Garcia Cabeza
e3ad813b4f
Improves styles for districts map page
2016-01-26 13:28:33 +01:00
Juanjo Bazán
c22aafa1a2
removes verbose pending errors from specs
2016-01-26 13:28:17 +01:00
rgarcia
bac19ffebd
makes seeds generic
2016-01-26 12:29:19 +01:00
rgarcia
433d23146f
adds pending debate specs
2016-01-26 12:13:43 +01:00
rgarcia
dbc19090ed
cleans up
2016-01-26 12:13:29 +01:00
rgarcia
328f5b4472
updates seeds
2016-01-25 22:28:46 +01:00
rgarcia
8940defbb8
adds specs
2016-01-25 22:28:46 +01:00
rgarcia
df04992405
adds translations
2016-01-25 22:28:46 +01:00
rgarcia
21b9e31f11
uses geozones instead of district tags
2016-01-25 22:28:46 +01:00
rgarcia
a86f6bc5b7
fixes conflicts with master
2016-01-25 22:28:46 +01:00
Perisso
93d794c089
change locales
2016-01-25 22:28:17 +01:00
Perisso
7d1d4cea4a
filter by districts and categories
2016-01-25 22:28:17 +01:00
rgarcia
0505be08e8
fixes conflicts
2016-01-25 22:24:58 +01:00
Juanjo Bazán
822d28a4a1
sets sanitize to false for already sanitized text
...
The new version of the rails-html-sanitizer (used by simple_format) strips by default all attributes. We want rel='nofollow' and target='_blank' here and the text has just been sanitized in text_with_links.
2016-01-25 21:52:59 +01:00
Juanjo Bazán
7b09a73861
rails up to security release 4.2.5.1
2016-01-25 21:44:57 +01:00
Raimond Garcia
6adcc6104c
Merge pull request #854 from consul/feature-flags-tweaks
...
Feature flags tweaks
2016-01-25 15:52:27 +01:00
Juanjo Bazán
3945eb1ff0
lists dynamic keys as ignore_unused in i18n-tasks
2016-01-25 14:59:37 +01:00
Juanjo Bazán
7931ae914b
adds specific treatment for feature flags in admin
2016-01-25 14:52:57 +01:00
Juanjo Bazán
c287ae97d9
fix setting key
2016-01-25 14:12:16 +01:00
Juanjo Bazán
bb60e6b8e0
adds #enabled? to Setting
2016-01-25 14:07:07 +01:00
Juanjo Bazán
05837afd72
adds #feature_flag? to Setting
2016-01-25 13:45:15 +01:00
Juanjo Bazán
853f2c6fba
fixes disabling of features via admin interface
2016-01-25 12:44:00 +01:00
Juanjo Bazán
64441825d8
renames settings zone in admin
2016-01-25 12:04:40 +01:00
Juanjo Bazán
23fe85db32
adds feature flag for spending_proposals in admin
2016-01-24 19:23:56 +01:00
Juanjo Bazán
03f2b8d7c1
devise up
2016-01-23 22:59:51 +01:00
Raimond Garcia
b79fd61c11
Merge pull request #851 from AjuntamentdeBarcelona/consul/mailer_locales
...
Store locale in a user's field and switch locale on mailers
2016-01-22 19:23:02 +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
Juanjo Bazán
8a4deba48e
updates dependencies
2016-01-21 18:11:35 +01:00
Juanjo Bazán
b5eb398486
Merge branch 'danibaena-master'
2016-01-21 18:03:50 +01:00
