Commit Graph

103 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
3752f3a53b Adds foundation 6 🎉 2016-02-26 19:33:33 +01:00
kikito
9e0494a82d Activates omniauth functionality 2016-01-26 18:15:45 +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
Alberto Garcia Cabeza
4d533c3ee3 Adds tabindex on users sign_in form 2016-01-20 16:28:42 +01:00
Juanjo Bazán
432e9e0d5b adds counter cache for user's notifications 2016-01-08 14:39:34 +01:00
Alberto Garcia Cabeza
e008d1f642 Adds new styles for notifications 2016-01-08 12:45: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
Juanjo Bazán
f57eef4929 makes public activity toggleable 2015-11-04 13:51:31 +01:00
rgarcia
e08ed41e98 fixes conflicts with master 2015-10-14 15:48:55 +02:00
Alberto Garcia Cabeza
2ca4557f2d Improves accesibility 2015-10-13 16:48:37 +02:00
kikito
5f74528f12 Modifies devise so that unconfirmed users w/o password can set it when confirming their account 2015-10-07 20:18:54 +02:00
Juanjo Bazán
7d8f1f2629 adds title for public devise views 2015-09-28 13:59:17 +02:00
juandefelix
b519cb75fa added warning text underneath omniauth sign up links 2015-09-19 20:36:16 -05:00
Alberto Garcia Cabeza
eedd919424 Improves styles and texts for devise pages 2015-09-07 00:16:54 +02:00
rgarcia
9838ba86ad hides social network login 2015-09-01 16:30:12 +02:00
Raimond Garcia
c806547c1a Merge pull request #257 from AyuntamientoMadrid/social_networks
Social networks
2015-08-27 10:52:10 +02:00
Alberto Garcia Cabeza
ad9e2cc637 Adds styles for social share and auth 2015-08-26 20:32:48 +02:00
Alberto Garcia Cabeza
33b501d98e Improves texts for instructions emails 2015-08-26 19:43:51 +02:00
Alberto Garcia Cabeza
522e40b9ce Adds styles to instructions emails 2015-08-26 18:51:53 +02:00
David Gil
59aede5b00 adds Google OAuth2 support 2015-08-25 14:15:24 +02:00
David Gil
86dccac9c6 adds support for Facebook OAuth 2015-08-24 20:24:54 +02:00
David Gil
af7396757f removes omniauth link from organizations 2015-08-24 20:24:54 +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
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
kikito
e84873d875 Modifies devise shared link to include organisations sometimes 2015-08-17 01:16:08 +02:00
kikito
de73eac2d0 Moves the registrations controller to users/registrations
This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
2015-08-17 01:16:07 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Alberto Garcia Cabeza
00af11396d Improves styles for auth pages 2015-08-12 14:07:34 +02:00
Alberto Garcia Cabeza
502920c7f2 Improves styles for account page, adds user image 2015-08-12 11:53:28 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Alberto Garcia Cabeza
c048f25941 Fixes conflicts 2015-08-08 13:28:29 +02:00
Alberto Garcia Cabeza
fdfef95595 Adds styles for account page and edit user 2015-08-08 13:21:46 +02:00
Alberto Garcia Cabeza
d45a22781a Changes styles for header 2015-08-07 23:23:16 +02:00
rgarcia
076448ec80 fixes credentials page 2015-08-07 17:47:12 +02:00
Raimond Garcia
3279eeba45 Merge pull request #111 from AyuntamientoMadrid/user_nickname_98
User nickname
2015-08-07 09:23:44 +02:00
Alberto Garcia Cabeza
f9cb8151ff Adds styles for authentication pages 2015-08-06 20:53:14 +02:00
kikito
17a741d838 Adds nickname support in the registration form 2015-08-06 18:54:03 +02:00
Alberto Garcia Cabeza
851aefbaa6 Adds styles for authentication pages 2015-07-30 19:51:33 +02:00
rgarcia
95101c4cc8 fixing conflicts [#45] 2015-07-29 13:36:48 +02:00
kikito
b87331c958 merges master and fixes conflicts 2015-07-29 13:00:33 +02:00
kikito
c71182f6a6 Adds classes to several buttons so they don't look ugly 2015-07-29 12:54:51 +02:00
Juanjo Bazán
daa172e408 adds i18n to all devise views
ref: #38
2015-07-29 12:18:55 +02:00
rgarcia
c5bfc9420f adds recaptcha validation to registration controller [#45] [#45] 2015-07-28 18:32:10 +02:00
rgarcia
05bff9dc1f adds styling to submit button 2015-07-28 13:55:31 +02:00
rgarcia
137267887c fixes specs 2015-07-27 23:21:15 +02:00
Alberto García Cabeza
1f3aa22571 Includes content for header 2015-07-27 21:19:46 +02:00
Alberto García Cabeza
f4c7b0edda Includes first styles for header and debates 2015-07-26 23:14:43 +02:00
Juanjo Bazán
984984473f Fix conflict 2015-07-18 21:58:43 +02:00
Juanjo Bazán
b6d2a5efd6 uses new hash syntax by default 2015-07-18 21:49:36 +02:00
rgarcia
580eda9621 adds minimum decency styling 2015-07-18 21:29:39 +02:00