Commit Graph

4510 Commits

Author SHA1 Message Date
rgarcia
f4f0593fda displays captcha only on new, not edit 2015-07-28 12:39:39 +02:00
rgarcia
90f476f8d1 Merge branch 'master' into home 2015-07-27 23:30:46 +02:00
Raimond Garcia
943b19c3a4 Merge pull request #40 from AyuntamientoMadrid/js_comments-21
Hide/show comment forms
2015-07-27 23:30:25 +02:00
rgarcia
cc3f151914 fixing conflicts 2015-07-27 23:29:32 +02:00
rgarcia
137267887c fixes specs 2015-07-27 23:21:15 +02:00
rgarcia
baaf9cac93 refactors duplicate form id scenario [#21] 2015-07-27 22:50:38 +02:00
rgarcia
99481722ce Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-07-27 22:32:48 +02:00
rgarcia
dea2964f08 fixes duplicate id in comment form [#21] 2015-07-27 22:22:12 +02:00
Alberto García Cabeza
c0a5200c10 Adds styles for debates show 2015-07-27 22:01:13 +02:00
Alberto García Cabeza
c2c176db75 Improves styles for debates home 2015-07-27 21:20:20 +02:00
Alberto García Cabeza
1f3aa22571 Includes content for header 2015-07-27 21:19:46 +02:00
rgarcia
daab640dd2 refactoring recaptcha 2015-07-27 18:48:30 +02:00
rgarcia
034c62f3b9 fixes recaptcha for turbolinks 2015-07-27 18:46:13 +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
rgarcia
ef2cd18028 configures recaptcha 2015-07-27 18:44:33 +02:00
kikito
bc1c49f19e Merge branch 'master' into js_comments-21 2015-07-27 17:23:44 +02:00
rgarcia
427dc1c545 Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-07-27 11:39:47 +02:00
Alberto García Cabeza
20a762e556 Modifies debates show 2015-07-26 23:14:43 +02:00
Alberto García Cabeza
0bb0785f99 Includes footer partial 2015-07-26 23:14:43 +02:00
Alberto García Cabeza
f4c7b0edda Includes first styles for header and debates 2015-07-26 23:14:43 +02:00
rgarcia
b674e109a5 adds appropriate text for comment replies 2015-07-25 18:56:52 +02:00
rgarcia
3cec9b98f2 adds hide/show behaviour to comment forms 2015-07-25 18:49:00 +02:00
Alberto García Cabeza
937d85b4d7 includes header partial 2015-07-24 09:55:38 +02:00
Juanjo Bazán
2a63d1f953 manages permissions for debate editing 2015-07-19 14:47:14 +02:00
Juanjo Bazán
bb5dc339fd changes default title 2015-07-19 13:27:44 +02:00
rgarcia
bb46182f10 moves comment form to top of comments 2015-07-19 12:56:15 +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
9cd3d77536 removes placeholder home 2015-07-18 21:38:13 +02:00
rgarcia
580eda9621 adds minimum decency styling 2015-07-18 21:29:39 +02:00
rgarcia
afdb0980b0 removes empty % sign when there are no votes 2015-07-18 21:27:56 +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
e783c2013a sanitises tag names [#8] 2015-07-18 17:50:40 +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
12d35085e0 fixing conflicts [#8] 2015-07-18 17:30:31 +02:00
rgarcia
e20af8ab06 adds tag cloud [#8] 2015-07-18 17:24:30 +02:00
rgarcia
72bc790310 adds tags to debates [#8] 2015-07-18 17:24:16 +02:00
rgarcia
83ac9dc1fc displays terms of conditions in new and create [#11] 2015-07-18 17:20:30 +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
9b4182250b displays terms of conditions in new and create [#11] 2015-07-18 14:49:57 +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
3108228cc7 adds user menu 2015-07-18 14:47:04 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00