Commit Graph

1580 Commits

Author SHA1 Message Date
Juanjo Bazán
8c7d47a922 typo 2015-09-06 20:39:35 +02:00
Juanjo Bazán
a8552a2c06 Merge pull request #381 from hermesdt/add_close_button_to_alert_boxes
Add close button to alert boxes
2015-09-06 20:31:43 +02:00
Álvaro Durán Tovar
7fd7f2cc81 fix indentation on shared/errors 2015-09-06 19:55:37 +02:00
Álvaro Durán Tovar
92ae988251 adds close button to alert boxes, also adds
data-alert attribute to enable javascript
on them
2015-09-06 19:54:12 +02:00
Álvaro Durán Tovar
4168e3c20a adds enviroment as a dependency for db:dev_seed task 2015-09-06 19:32:07 +02:00
Raimond Garcia
4aadc7af5e Merge pull request #380 from AyuntamientoMadrid/http-basic-auth
uses secrets variable to decide when to use http_auth
2015-09-06 18:51:51 +02:00
kikito
e9dc0d54cd uses secrets variable to decide when to use http_auth 2015-09-06 18:36:31 +02:00
Juanjo Bazán
9a6d064b4b Merge pull request #379 from AyuntamientoMadrid/capistrano_assets
Capistrano assets
2015-09-06 17:20:56 +02:00
rgarcia
554d58b620 comments out custom capistrano asset task 2015-09-06 17:04:25 +02:00
rgarcia
6e16bc7bc3 uses capistrano assets standard task 2015-09-06 17:02:52 +02:00
rgarcia
4d78d298b7 reverts capistrano/assets check 2015-09-06 17:00:05 +02:00
rgarcia
31f0bdf3c4 testing css asset change with capistrano/assets 2015-09-06 16:57:58 +02:00
Raimond Garcia
e560bdfc90 Merge pull request #377 from AyuntamientoMadrid/caching_debates
updates comment form cache
2015-09-06 14:23:24 +02:00
rgarcia
d8f8dc826b updates comment form cache 2015-09-06 14:22:46 +02:00
Raimond Garcia
fe26894ebc Merge pull request #375 from AyuntamientoMadrid/hidden-children-comments
shows visible children of hidden comments
2015-09-06 13:55:11 +02:00
Raimond Garcia
52c442161b Merge pull request #374 from AyuntamientoMadrid/cache-refactor
Cache refactor
2015-09-06 13:54:51 +02:00
rgarcia
c6886cfad6 fixes typo 2015-09-06 13:42:31 +02:00
rgarcia
994af94253 enables rollbar in staging env 2015-09-06 13:38:19 +02:00
Juanjo Bazán
3845e6bfd2 shows visible children of hidden comments
Fixes #368
2015-09-06 12:55:44 +02:00
Juanjo Bazán
e706aaff2c adds extra specs for debate's cache 2015-09-06 12:40:13 +02:00
Juanjo Bazán
31b00c32f4 removes unneeded to_a 2015-09-06 12:25:47 +02:00
Juanjo Bazán
60089b8986 uses author info in comment/debate cache
author is already preloaded and we avoid expensive touching methods
2015-09-06 12:13:39 +02:00
Juanjo Bazán
5b3f9e5642 uses preloaded info 2015-09-06 12:07:58 +02:00
Juanjo Bazán
e3449723b3 Merge pull request #370 from AyuntamientoMadrid/verified_users
Verified users
2015-09-06 11:35:56 +02:00
Juanjo Bazán
5aed99000c Merge pull request #372 from AyuntamientoMadrid/beta_testers
fixes exception when not logged in
2015-09-06 11:35:17 +02:00
rgarcia
afea21c2bc fixes exception when not logged in 2015-09-06 11:26:15 +02:00
rgarcia
cbd4e30e80 fixes specs 2015-09-06 11:15:24 +02:00
Enrique García
c28c39e052 Merge pull request #371 from AyuntamientoMadrid/residence_verification_tries
increases residence verification tries only after a Census call
2015-09-06 00:03:36 +02:00
Enrique García
d3d0671978 Merge pull request #369 from AyuntamientoMadrid/caching_debates
Caches debates and comments
2015-09-06 00:02:07 +02:00
rgarcia
34218d112b increases residence verification tries after a Census call 2015-09-05 23:57:47 +02:00
rgarcia
189f94f1d6 removes spec focus 2015-09-05 23:20:10 +02:00
rgarcia
2260de9451 uppercases document number 2015-09-05 23:04:13 +02:00
rgarcia
17a1bedec0 removes document type from verified users query 2015-09-05 22:57:54 +02:00
rgarcia
9515ccc3a8 adds specs 2015-09-05 22:03:33 +02:00
rgarcia
0bca1c5b95 upgrades ruby hash syntax 2015-09-05 22:02:51 +02:00
rgarcia
cba83e6dd2 touches comments and debates after changes 2015-09-05 22:02:51 +02:00
rgarcia
7775da6f8d fixes cache error when no user signed in 2015-09-05 22:02:51 +02:00
rgarcia
e751c53a5d converts necessary variables to instance variables 2015-09-05 22:02:51 +02:00
rgarcia
0e1678467d adds admins and moderators to cache keys 2015-09-05 22:02:51 +02:00
rgarcia
5200d76be6 caches comments 2015-09-05 22:02:51 +02:00
rgarcia
93378eea98 caches debates show 2015-09-05 22:02:50 +02:00
Raimond Garcia
17ebb07daf Merge pull request #367 from AyuntamientoMadrid/blog
adds nicer blog url
2015-09-05 20:26:22 +02:00
Juanjo Bazán
0138847798 fix build 2015-09-05 20:19:53 +02:00
Raimond Garcia
1c62a9b8ab Merge pull request #366 from AyuntamientoMadrid/search-debates
Search debates
2015-09-05 20:19:37 +02:00
Juanjo Bazán
5d5de36ad1 adds spec for info pages 2015-09-05 20:16:20 +02:00
Juanjo Bazán
ae872b88ac updates blog link 2015-09-05 20:15:31 +02:00
rgarcia
2bc1b5f1a5 adds nicer blog url 2015-09-05 19:57:33 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
Juanjo Bazán
771f44c22b adds self.search to Debate 2015-09-05 15:05:56 +02:00
Alberto Garcia Cabeza
54eeff41b7 Adds search form to sidebar 2015-09-05 14:01:59 +02:00