rgarcia
|
034c62f3b9
|
fixes recaptcha for turbolinks
|
2015-07-27 18:46:13 +02:00 |
|
rgarcia
|
115eb86539
|
fixes typo
|
2015-07-27 18:46:13 +02:00 |
|
rgarcia
|
23fc19f4b0
|
fixing specs
|
2015-07-27 18:46:13 +02:00 |
|
rgarcia
|
382028b7b6
|
adds recaptcha translations
|
2015-07-27 18:44:33 +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 |
|
Juanjo Bazán
|
b515340dc7
|
Merge pull request #36 from AyuntamientoMadrid/secrets
removes secrets.yml from version control
|
2015-07-27 18:29:48 +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 |
|
rgarcia
|
39711caaf6
|
fixes transaction fixtures call [#21]
|
2015-07-27 11:39:25 +02:00 |
|
rgarcia
|
598310c01c
|
adds turbolinks compatibility [#21]
|
2015-07-27 11:24:11 +02:00 |
|
Raimond Garcia
|
fb31863174
|
Merge pull request #37 from AyuntamientoMadrid/home
JS comment forms
|
2015-07-27 11:17:09 +02:00 |
|
rgarcia
|
4d0f9ae5c3
|
fixes specs
|
2015-07-27 11:15:20 +02:00 |
|
rgarcia
|
0aaa8169f0
|
tmp commit [#21]
|
2015-07-27 11:12:55 +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 |
|
Alberto García Cabeza
|
f9fc69916a
|
Includes images for header and homepage background
|
2015-07-26 23:14:43 +02:00 |
|
Alberto García Cabeza
|
a31e5e69c6
|
Adds foundation icons font
|
2015-07-26 23:14:43 +02:00 |
|
rgarcia
|
26b16ee874
|
configures database_cleaner
|
2015-07-26 13:44:22 +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 |
|
rgarcia
|
723b0584ce
|
removes secrets.yml from version control
|
2015-07-25 18:19:03 +02:00 |
|
Juanjo Bazán
|
bd92f6ec5c
|
makes tag list sorted
fixes build
|
2015-07-24 12:51:55 +02:00 |
|
Juanjo Bazán
|
50d32cd2b7
|
removes db name from defaults
|
2015-07-24 12:51:28 +02:00 |
|
Juanjo Bazán
|
d8f356d0a5
|
removes unnecessary sqlite3 gem
|
2015-07-24 12:50:59 +02:00 |
|
Juanjo Bazán
|
1d070adae5
|
Merge pull request #34 from AyuntamientoMadrid/home
adds header partial
|
2015-07-24 12:03:46 +02:00 |
|
Alberto García Cabeza
|
68c45198c6
|
Includes fonts files
|
2015-07-24 11:50:08 +02:00 |
|
Alberto García Cabeza
|
937d85b4d7
|
includes header partial
|
2015-07-24 09:55:38 +02:00 |
|
Raimond Garcia
|
13445118c1
|
Merge pull request #30 from AyuntamientoMadrid/travis-config
adds before script to travis config
|
2015-07-22 16:02:11 +02:00 |
|
Juanjo Bazán
|
eaac957f4c
|
adds before script to travis config
|
2015-07-22 15:20:13 +02:00 |
|
Raimond Garcia
|
5a8617d33a
|
Merge pull request #29 from AyuntamientoMadrid/home
configures scss
|
2015-07-22 13:41:56 +02:00 |
|
Alberto García Cabeza
|
f5ba516a47
|
Merge branch 'master' into home
|
2015-07-22 13:38:51 +02:00 |
|
Alberto García Cabeza
|
1617691033
|
configures scss
|
2015-07-22 13:35:01 +02:00 |
|
Juanjo Bazán
|
9a27bf9f79
|
updates travis.yml to make use of config files
|
2015-07-22 13:24:39 +02:00 |
|
Juanjo Bazán
|
12bad01d87
|
Merge pull request #28 from AyuntamientoMadrid/postgres
configures postgres
|
2015-07-22 13:04:21 +02:00 |
|
Alberto García Cabeza
|
8d0c326267
|
configures postgres
|
2015-07-22 13:01:52 +02:00 |
|
Raimond Garcia
|
e79dd1dc7a
|
Merge pull request #27 from AyuntamientoMadrid/20-edit-debate-permissions
Edit debate permissions
|
2015-07-19 16:55:37 +02:00 |
|
Juanjo Bazán
|
2a63d1f953
|
manages permissions for debate editing
|
2015-07-19 14:47:14 +02:00 |
|
Juanjo Bazán
|
df1a800d94
|
adds editable methods to Debate
|
2015-07-19 14:46:21 +02:00 |
|
Juanjo Bazán
|
bb5dc339fd
|
changes default title
|
2015-07-19 13:27:44 +02:00 |
|
Juanjo Bazán
|
63b6a44ca3
|
Merge pull request #26 from AyuntamientoMadrid/comment-styling
moves comment form to top of comments
|
2015-07-19 12:57:53 +02:00 |
|
rgarcia
|
bb46182f10
|
moves comment form to top of comments
|
2015-07-19 12:56:15 +02:00 |
|
Juanjo Bazán
|
ab5f28c4de
|
Merge branch 'cleanup'
|
2015-07-18 21:59:41 +02:00 |
|
Juanjo Bazán
|
984984473f
|
Fix conflict
|
2015-07-18 21:58:43 +02:00 |
|
Raimond Garcia
|
d29d2ca65d
|
Merge pull request #18 from AyuntamientoMadrid/syntax
Uses new hash syntax by default
|
2015-07-18 21:53:40 +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
|
2eb0602097
|
fixes specs
|
2015-07-18 21:37:15 +02:00 |
|
rgarcia
|
60ae203d0a
|
Merge branch 'master' into cleanup
|
2015-07-18 21:35:21 +02:00 |
|