Juanjo Bazán
75f03499bc
fixes social media meta tags
2016-01-28 13:09:13 +01:00
kikito
4bac9e6ea1
updates oauth code to handle faulty facebook responses better
2016-01-27 18:36:22 +01:00
rgarcia
5bea145d71
scopes tags only for Proposals
2016-01-27 15:11:59 +01:00
rgarcia
48b5aba1c5
removes unused helper
2016-01-27 14:55:42 +01:00
rgarcia
eed3623466
users full text search of tag
2016-01-27 14:19:21 +01:00
rgarcia
5a3dc42dea
removes tag count
2016-01-27 14:18:40 +01:00
rgarcia
209b6407d3
increases tag limit to 10
2016-01-27 14:17:32 +01:00
rgarcia
5d4b6fae92
scopes tags by category or geozone
2016-01-27 14:15:12 +01:00
rgarcia
0175cd2c68
does not display category tags nor geozone names
2016-01-27 13:52:11 +01:00
rgarcia
e7e5c531a0
moves tag_cloud logic to a model
2016-01-27 13:02:18 +01:00
Juanjo Bazán
4b1430c9d6
Merge pull request #848 from consul/omniauth2
...
Omniauth2
2016-01-27 10:04:26 +01:00
kikito
957e07489a
remove unuseful comment
2016-01-26 19:59:20 +01:00
kikito
a796dade7a
extracts methods into user.rb
2016-01-26 19:48:01 +01:00
Alberto Garcia Cabeza
fc857ea603
Adds styles for geozone on proposal show
2016-01-26 18:42:28 +01:00
rgarcia
4e7e0e3a7a
makes geozone clickable in proposal show
2016-01-26 18:27:47 +01:00
kikito
646ca8a686
Splits omniauth_callbacks_controller#login_with method in two smaller ones
...
Uses new hash syntax in specs
2016-01-26 18:15:45 +01:00
kikito
9e0494a82d
Activates omniauth functionality
2016-01-26 18:15:45 +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
a606c7aa8d
Renames confirmed_oauth_email to oauth_email
...
Refactors the way oauth_email is used to cover more cases (fixes pending specs)
2016-01-26 18:15:40 +01:00
kikito
55216ba431
allows creating email duplicates while registering with omniauth
2016-01-26 18:15:39 +01:00
kikito
d5eab64568
adds feature flags for omniauth login buttons/controls
...
Conflicts:
app/controllers/users/omniauth_callbacks_controller.rb
app/views/devise/_omniauth_form.html.erb
2016-01-26 18:15:39 +01:00
kikito
98f99954e7
Corrects the logic dealing with confirmations of users via oauth
2016-01-26 18:15:39 +01:00
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
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
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
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
rgarcia
dbc19090ed
cleans up
2016-01-26 12:13:29 +01:00
rgarcia
21b9e31f11
uses geozones instead of district tags
2016-01-25 22:28:46 +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
7931ae914b
adds specific treatment for feature flags in admin
2016-01-25 14:52:57 +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
23fe85db32
adds feature flag for spending_proposals in admin
2016-01-24 19:23:56 +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
027e8b2398
Merge branch 'microweb10-registration_username_ajax_validation'
2016-01-21 18:02:42 +01:00
rgarcia
82279b4f6b
uses get instead of post to check username
2016-01-21 17:27:43 +01:00
