rgarcia
|
99d779bcec
|
adds letter code verification
|
2015-09-02 21:57:03 +02:00 |
|
rgarcia
|
280028cfa4
|
adds missing translation for incorrect phone
|
2015-09-02 21:45:53 +02:00 |
|
Juanjo Bazán
|
73f0b4b74e
|
adds migration to remove AaCwT columns
it migrates existing comments to ancestry
|
2015-09-02 19:24:57 +02:00 |
|
Juanjo Bazán
|
dee2d0196b
|
ancestries
moves to ancestry from acts_as_commentable_with_threading
|
2015-09-02 19:23:09 +02:00 |
|
Juanjo Bazán
|
3eae5dff1f
|
adds ancestry
|
2015-09-02 19:21:15 +02:00 |
|
Raimond Garcia
|
faf1b32cf5
|
Merge pull request #329 from AyuntamientoMadrid/verification
Verification
|
2015-09-02 18:58:25 +02:00 |
|
kikito
|
e3cbae4f02
|
Makes capybara exact. Should fix some randomly-failing specs
|
2015-09-02 18:05:43 +02:00 |
|
Raimond Garcia
|
36d8bd778b
|
Merge pull request #325 from AyuntamientoMadrid/admin-in-seed
creates admin user in db/seeds
|
2015-09-02 17:36:29 +02:00 |
|
kikito
|
47b66f3f37
|
creates admin user in db/seeds
|
2015-09-02 17:25:12 +02:00 |
|
Juanjo Bazán
|
e0c67d8404
|
adds ancestry column to comments
|
2015-09-02 17:24:24 +02:00 |
|
Juanjo Bazán
|
eb689d7c7e
|
refactors comment form
|
2015-09-02 17:22:21 +02:00 |
|
Juanjo Bazán
|
df5ef2dc29
|
makes helper independent of commentable class
|
2015-09-02 17:06:11 +02:00 |
|
kikito
|
c7b44485b3
|
modifies example so that the dev database can be used to generate the assets of staging, preproduction and production
|
2015-09-02 16:52:29 +02:00 |
|
Juanjo Bazán
|
04127b23f9
|
Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
|
2015-09-02 14:24:06 +02:00 |
|
kikito
|
c3b1fa7434
|
fixes failing i18n specs
|
2015-09-02 14:15:14 +02:00 |
|
Raimond Garcia
|
dac1a9726b
|
Merge pull request #322 from AyuntamientoMadrid/one-hundred-free-votes
changes rules for allowing debate votes
|
2015-09-02 13:46:44 +02:00 |
|
Juanjo Bazán
|
274ddb2589
|
changes rules for allowing debate votes
first 100 votes are allowed for unverified users
|
2015-09-02 13:40:38 +02:00 |
|
kikito
|
79febe7bb8
|
Adds shared/filter_subnav partial to DRY filters
|
2015-09-02 13:39:27 +02:00 |
|
kikito
|
ebacc8c9c7
|
Uses has_filters in all controllers with filters & renames @filter to @current_filter
|
2015-09-02 13:21:46 +02:00 |
|
kikito
|
83d08b0017
|
Implements the HasFilters controller concern
|
2015-09-02 13:21:05 +02:00 |
|
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 |
|