Alberto Garcia Cabeza
|
53e22e78ec
|
Renames images for header, adds for default user
|
2015-07-29 17:45:43 +02:00 |
|
kikito
|
c495d4678c
|
merges master and fixes conflicts
|
2015-07-29 17:13:09 +02:00 |
|
Juanjo Bazán
|
08671414f2
|
removes hashrockets
|
2015-07-29 14:27:58 +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 |
|
Juanjo Bazán
|
2ba3f8a1a9
|
Merge pull request #39 from AyuntamientoMadrid/wysiwyg-39
Adds WYSIWYG to debate's form
|
2015-07-29 10:19:23 +02:00 |
|
rgarcia
|
1deecea0af
|
adds wysiwyg to debate description
|
2015-07-28 21:46:01 +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 |
|
Juanjo Bazán
|
efc1b71dbf
|
adds i18n to header
ref: #38
|
2015-07-28 18:49:41 +02:00 |
|
rgarcia
|
7a53055db1
|
updates alert styling [#45]
|
2015-07-28 18:33:09 +02:00 |
|
rgarcia
|
81a5ddb580
|
refactors recaptchable helper [#45]
|
2015-07-28 18:32:45 +02:00 |
|
rgarcia
|
c5bfc9420f
|
adds recaptcha validation to registration controller [#45] [#45]
|
2015-07-28 18:32:10 +02:00 |
|
Enrique García
|
6a6804f73b
|
Merge pull request #48 from AyuntamientoMadrid/footer
Adds fake footer
|
2015-07-28 17:00:03 +02:00 |
|
Enrique García
|
5860efe35d
|
Merge pull request #46 from AyuntamientoMadrid/beautification
Beautification
|
2015-07-28 16:50:32 +02:00 |
|
Juanjo Bazán
|
e9c1910d7d
|
adds i18n to debates' interface
|
2015-07-28 16:48:36 +02:00 |
|
kikito
|
d5710c8dc6
|
Removes '|' after button in debates/show
The rest of the commit noise is trailing spaces :(
|
2015-07-28 16:32:07 +02:00 |
|
decabeza
|
d422830228
|
Adds fake footer
|
2015-07-28 14:07:47 +02:00 |
|
rgarcia
|
05bff9dc1f
|
adds styling to submit button
|
2015-07-28 13:55:31 +02:00 |
|
rgarcia
|
1609f6970f
|
displays debates next to each other
|
2015-07-28 13:55:15 +02:00 |
|
rgarcia
|
62be883bcc
|
displays welcome image only at home page
|
2015-07-28 13:54:43 +02:00 |
|
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 |
|