palomahnhp
f84265e7d8
improved display of statistics
2016-02-02 09:31:52 +01:00
Raimond Garcia
f1672180a8
Merge pull request #860 from MaiteHdezRivas/suggest_before_creating
...
Suggest before creating
2016-02-01 18:41:21 +01:00
Maite
8f1431ec3f
corrections about coding style
2016-02-01 17:11:29 +01:00
Juanjo Bazán
282348ef4b
updates dependencies
2016-01-30 20:23:52 +01:00
Juanjo Bazán
ff03f20f4e
refactors spec to avoid flaky test errors
2016-01-29 11:41:41 +01:00
Juanjo Bazán
73aea8f127
rescues ahoy error stoping user verifications
2016-01-29 11:41:16 +01:00
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
Enrique García
67303159fa
Merge pull request #865 from consul/trending-tags
...
Trending tags
2016-01-27 15:50:38 +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
MaiteHdezRivas
5dd4633d6a
Merge branch 'suggest_before_creating'
...
Conflicts:
app/assets/javascripts/application.js
app/controllers/debates_controller.rb
app/controllers/proposals_controller.rb
config/locales/es.yml
config/routes.rb
db/schema.rb
spec/features/debates_spec.rb
spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
rgarcia
e7e5c531a0
moves tag_cloud logic to a model
2016-01-27 13:02:18 +01:00
MaiteHdezRivas
7406904c51
adding suggest with coffescript
2016-01-27 12:32:44 +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
Raimond Garcia
c7309ae6fc
Merge pull request #859 from consul/clickable-geozone
...
makes geozone clickable in proposal show
2016-01-26 19:45:59 +01:00
rgarcia
606a87bbbf
force build
2016-01-26 18:51:59 +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
a23d0ebbd8
fixes issues after squashing
2016-01-26 18:19:18 +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
92786764b7
Adds new auth tests
...
Conflicts:
spec/features/users_auth_spec.rb
2016-01-26 18:15:39 +01:00
kikito
55216ba431
allows creating email duplicates while registering with omniauth
2016-01-26 18:15:39 +01:00
kikito
1617f7295c
requests omniauth facebook email
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
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
