Commit Graph

20144 Commits

Author SHA1 Message Date
Juanjo Bazán
31a8c15344 removes redundant condition 2015-09-02 12:57:09 +02:00
Alberto Garcia Cabeza
c06491db57 Changes test for verification process 2015-09-02 12:51:32 +02:00
Enrique García
7d3cb8b493 Merge pull request #321 from AyuntamientoMadrid/votes-organizations
Disallow votes from organizations
2015-09-02 12:50:12 +02:00
Juanjo Bazán
0c7ce4b6cf includes organizations in the cache key helper 2015-09-02 12:39:31 +02:00
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
Juanjo Bazán
5c10435064 disables voting on comments for not allowed users 2015-09-02 12:23:56 +02:00
Juanjo Bazán
8915ce7ffd adds interface to disallow organizations votes
on debates
2015-09-02 12:16:55 +02:00
Juanjo Bazán
361ccb8624 adds setting to dev_seeds 2015-09-02 11:58:29 +02:00
Juanjo Bazán
58d2af7340 Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-09-02 11:39:32 +02:00
Juanjo Bazán
ef200c4ea1 update dependencies 2015-09-02 11:39:12 +02:00
rgarcia
abfc93ea78 hot fix to take into account preproduction 2015-09-02 11:36:30 +02:00
kikito
15115f0179 Merge branch 'dev-seed' 2015-09-02 10:49:00 +02:00
kikito
09764ac783 adds tags to debates in dev_seed 2015-09-02 10:48:43 +02:00
Juanjo Bazán
940f5c42a0 typo 2015-09-02 10:42:54 +02:00
kikito
0952762120 refactors hiding comments & debates, adds confirmed hide 2015-09-02 10:40:03 +02:00
rgarcia
dab68d47a0 Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-09-01 22:56:43 +02:00
rgarcia
587749782d hot fix for anonymous votes 2015-09-01 22:56:27 +02:00
rgarcia
b5d9a00e2e adds preproduction and production to database.yml.example 2015-09-01 22:56:18 +02:00
rgarcia
dc41e25cee sets preproduction deploy variables 2015-09-01 22:56:01 +02:00
Juanjo Bazán
73ed9f84b0 removes deprecated setting from dev_seed 2015-09-01 21:26:36 +02:00
Juanjo Bazán
e604ca656a Merge pull request #316 from AyuntamientoMadrid/secrets
Secrets
2015-09-01 21:25:45 +02:00
rgarcia
41dc30f41a adds server_name to secrets.yml.example 2015-09-01 21:22:45 +02:00
Raimond Garcia
085c2920c0 Merge pull request #314 from AyuntamientoMadrid/setting
Settings improvements
2015-09-01 21:15:57 +02:00
Raimond Garcia
3974ee1870 Merge pull request #315 from AyuntamientoMadrid/dev-seed
rake db:dev_seed
2015-09-01 21:12:19 +02:00
rgarcia
a82eac8e16 adds capistrano task to upload secrets.yml 2015-09-01 20:12:44 +02:00
kikito
62415991c0 Fixes an issue found on comments using the dev_seed 2015-09-01 20:11:45 +02:00
kikito
55bab0e535 Adds a rake db:dev_seeds task 2015-09-01 20:11:21 +02:00
kikito
4c56af4ca4 Adds Faker gem 2015-09-01 20:10:36 +02:00
rgarcia
362c9b9e33 updates secrets.yml.example 2015-09-01 20:06:09 +02:00
rgarcia
c1e85d7894 updates http_basic keys 2015-09-01 20:05:47 +02:00
rgarcia
0df72b9260 updates census api keys 2015-09-01 20:05:35 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
174bd73b89 removes official_level_0_name setting 2015-09-01 20:00:41 +02:00
rgarcia
7af1bc526a adds preproduction environment 2015-09-01 19:54:21 +02:00
Juanjo Bazán
e2f73ef293 Merge pull request #310 from AyuntamientoMadrid/exception_notification
configures rollbar gem
2015-09-01 19:52:17 +02:00
Raimond Garcia
2b1b6b1640 Merge pull request #309 from AyuntamientoMadrid/limit-votes
Limit votes
2015-09-01 19:50:16 +02:00
rgarcia
e1d6319953 enable rollbar only in pre and pro envs 2015-09-01 19:48:35 +02:00
rgarcia
c350dcfff4 configures rollbar gem 2015-09-01 18:41:28 +02:00
Juanjo Bazán
f02f1a9888 adds extra expect in spec to avoid loadtime errors 2015-09-01 17:54:09 +02:00
Juanjo Bazán
2ed0486423 toggles layer on votes via js 2015-09-01 17:49:03 +02:00
Juanjo Bazán
4cfde3242a changes text 2015-09-01 17:49:03 +02:00
Juanjo Bazán
ac7ad1d863 hides 'too many anonymous votes' layer 2015-09-01 17:49:03 +02:00
Juanjo Bazán
9f4a98d3a0 moves translation keys 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
bcc58ab0c4 Adds styles for too much anonymous votes 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf Adds styles for too much anonymous comments 2015-09-01 17:49:02 +02:00
Juanjo Bazán
872a23443b updates anonymous counter in debate when voted
refactors to move all related code to Debate model
2015-09-01 17:49:02 +02:00
Juanjo Bazán
9e7722e7ef adds verification specs for user
includes #unverified? method
2015-09-01 17:49:02 +02:00
Juanjo Bazán
bbf96259fc adds controller check for anonymous votes 2015-09-01 17:49:02 +02:00
Juanjo Bazán
3a15895617 loads seeds for testing 2015-09-01 17:49:01 +02:00
Juanjo Bazán
0dca4c277b adds Setting validation 2015-09-01 17:49:01 +02:00