Commit Graph

17301 Commits

Author SHA1 Message Date
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
rgarcia
24924497f3 fixes conflicts [#21] 2015-07-27 21:55:43 +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
Alberto García Cabeza
0a1f50edd5 Deletes Roboto black font 2015-07-27 21:13:55 +02:00
kikito
00d21fbabd Remove focus from test 2015-07-27 19:22:17 +02:00
kikito
bed380fffd Make the comment button appear by clicking in "Comentar" in the test 2015-07-27 19:22:05 +02:00
kikito
be173ff581 removes use_transaction_fixtures from rails_helper
It is already configured in spec_helper.rb (and makes other things fail)
2015-07-27 19:07:02 +02:00
kikito
d8367464c6 Configure DatabaseCleaner exactly like it says on its documentation 2015-07-27 19:05:15 +02:00
kikito
ec282e8d3e Add debug gem: launchy
you can write save_and_open_page to see the page’s status inside a
feature
2015-07-27 19:04:13 +02:00
kikito
1e2f8704a5 Change order in requires to fix tests 2015-07-27 19:01:06 +02:00
Juanjo Bazán
018389ecda Merge pull request #33 from AyuntamientoMadrid/captcha
adds ReCaptcha to debates creation form
2015-07-27 18:51:52 +02:00
Juanjo Bazán
b436331ce5 fixes key name 2015-07-27 18:48:30 +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
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