Juanjo Bazán
af0698da35
fixes conflicts
2015-08-07 10:12:58 +02:00
Raimond Garcia
3279eeba45
Merge pull request #111 from AyuntamientoMadrid/user_nickname_98
...
User nickname
2015-08-07 09:23:44 +02:00
kikito
c4c764df38
Adds nickname and use_nickname to "my profile"
2015-08-06 19:19:45 +02:00
kikito
17a741d838
Adds nickname support in the registration form
2015-08-06 18:54:03 +02:00
Juanjo Bazán
33489e7b0c
adds css classes to voted options in debates
...
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
rgarcia
515d083633
use custom layout for devise controllers
2015-08-06 16:01:01 +02:00
rgarcia
ec6d34a49f
fixes conflicts
2015-08-06 13:42:57 +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
Fernando Seror
a89d621d1d
Allow locale to be set through the front-end
...
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
parameters
* Create initializer to explicitly set the available locales, the
default and the load_path
2015-08-05 15:43:39 -05:00
Juanjo Bazán
062ef365ad
vote action not allowed for unauthenticated users
2015-08-05 14:34:55 +02:00
rgarcia
fa5b678b69
fixes conflicts with master [ #25 ]
2015-08-05 13:47:23 +02:00
rgarcia
91b52ad8d2
refactors voting implementation [ #25 ]
2015-08-05 12:24:22 +02:00
kikito
08fdc768b2
fix wrong merge with master
2015-08-05 12:17:27 +02:00
kikito
d7a9f05cc5
merges master and fixes conflicts
2015-08-05 12:07:54 +02:00
Juanjo Bazán
a2ea42d13d
adds first 3 debates as featured_debates
2015-08-04 18:41:09 +02:00
Juanjo Bazán
c3046ccc2b
fixes build
...
adds empty featured_debates
2015-08-04 17:56:38 +02:00
rgarcia
823426bfde
verify captcha only when captcha keys present
2015-08-04 12:54:24 +02:00
rgarcia
2a3086010e
adds voting for comments functionality [ #25 ]
2015-08-02 13:37:37 +02:00
rgarcia
cd2d05e0c5
fixing conflicts [ #47 ] [ #47 ]
2015-07-30 18:19:38 +02:00
kikito
c495d4678c
merges master and fixes conflicts
2015-07-29 17:13:09 +02:00
rgarcia
bdcd513f26
responds with ajax to debate vote [ #47 ]
2015-07-28 20:52:59 +02:00
rgarcia
3247180dfa
responds with ajax to comment creation [ #47 ]
2015-07-28 20:32:53 +02:00
rgarcia
c5bfc9420f
adds recaptcha validation to registration controller [ #45 ] [ #45 ]
2015-07-28 18:32:10 +02:00
Juanjo Bazán
e9c1910d7d
adds i18n to debates' interface
2015-07-28 16:48:36 +02:00
rgarcia
daab640dd2
refactoring recaptcha
2015-07-27 18:48:30 +02:00
rgarcia
23fc19f4b0
fixing specs
2015-07-27 18:46:13 +02:00
rgarcia
cbef22606e
adds recaptcha verification to debates
2015-07-27 18:44:33 +02:00
Juanjo Bazán
2a63d1f953
manages permissions for debate editing
2015-07-19 14:47:14 +02:00
rgarcia
9cd3d77536
removes placeholder home
2015-07-18 21:38:13 +02:00
rgarcia
b060ffaa17
fixing conflicts [ #9 ]
2015-07-18 18:19:00 +02:00
rgarcia
73c3890027
fixing conflicts [ #9 ]
2015-07-18 18:16:10 +02:00
rgarcia
e006549092
adds votes to debates [ #9 ]
2015-07-18 18:10:19 +02:00
rgarcia
28e36b76e2
fixing conflicts [ #7 ]
2015-07-18 18:04:23 +02:00
rgarcia
fce0068bf4
fixing conflicts [ #7 ]
2015-07-18 17:40:38 +02:00
rgarcia
98463e4930
adds comments to debates [ #7 ]
2015-07-18 17:38:57 +02:00
rgarcia
72bc790310
adds tags to debates [ #8 ]
2015-07-18 17:24:16 +02:00
rgarcia
45094a86bc
adds author to debates [ #11 ]
2015-07-18 17:20:30 +02:00
rgarcia
c55021e18b
fixing conflicts [ #8 ]
2015-07-18 15:04:36 +02:00
rgarcia
e92174e107
adds author to debates [ #11 ]
2015-07-18 14:49:22 +02:00
rgarcia
9fa952c118
adds first name and last name to users
2015-07-18 14:47:04 +02:00
rgarcia
9b3d41552d
configures responders gem [ #5 ]
2015-07-16 19:25:47 +02:00
rgarcia
be342cac76
Basic CRU operations [ #5 ]
2015-07-16 19:22:20 +02:00
rgarcia
7ba6fc50bb
cherry picks capybara config [ #5 ]
2015-07-16 19:16:04 +02:00
rgarcia
8db3630837
initial commit
2015-07-15 13:32:13 +02:00
