Commit Graph

1257 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
1e95cdfce3 Fix dev_seeds 2017-01-07 21:58:29 +01:00
Alberto Miedes Garcés
861a723724 Only show public_voter if votable.total_votes are above threshold 2017-01-07 17:22:18 +01:00
kikito
3c9e08b06f Adds organization_name attribute to budget investments 2017-01-06 18:43:55 +01:00
Alberto Miedes Garcés
98db33f623 Track email digests 2017-01-05 23:31:11 +01:00
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
Fernando Blat
b6b33ff85b Merge pull request #51 from medialab-prado/14-base-legislation-annotations
Base Legislation Annotations
2017-01-04 13:50:37 +01:00
Fernando Blat
ad20302052 Merge pull request #48 from medialab-prado/13-draft-version-page
Draft Version page
2017-01-04 13:43:54 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
0c1d7c15c1 adds date and officer log to recounts 2017-01-03 21:30:03 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
52d182f099 Removes geozone from budget heading 2017-01-03 18:51:21 +01:00
kikito
18bd44d91f do not use html in generation of unfeasibility reason 2017-01-03 18:00:35 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Juanjo Bazán
55fea6c037 adds polls-related seed data 2017-01-02 19:29:43 +01:00
Juanjo Bazán
1aa845a9c6 adds published to polls 2017-01-02 18:23:24 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Juanjo Bazán
85b8f54570 adds Poll::Recount 2017-01-02 13:34:53 +01:00
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
kikito
f14f7b9a70 Adds new descriptions to budget in dev_seeds 2017-01-02 10:02:57 +01:00
kikito
07a99b8e3f Modifies the phase field in Budget 2017-01-02 10:02:05 +01:00
kikito
d80dedaad8 Adds sanitized descriptions for all phases to budget model 2017-01-01 12:51:17 +01:00
kikito
181749b4f6 Removes valuating boolean from budgets 2016-12-30 18:41:35 +01:00
Alberto Garcia Cabeza
00581fcacc adds setting key deleted by mistake 2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
kikito
110a4091f8 Adds budget investment location 2016-12-29 17:30:21 +01:00
rgarcia
2a0267a1af updates db schema 2016-12-29 12:34:50 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Amaia Castro
5e01b380cd Legislation Answer model 2016-12-27 18:21:50 +01:00
Juanjo Bazán
15b072a983 adds date to poll_officer_assignments 2016-12-27 17:43:44 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Alberto Miedes Garcés
d4b049175c Merge branch 'master' into api-dev-0.18.11 2016-12-26 12:55:17 +01:00
Alberto Miedes Garcés
64cf3cde34 Modified seeds to provide more meaningful data 2016-12-26 12:52:23 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Fernando Blat
05a00df8ed Set the default from address as consul.dev 2016-12-23 15:46:39 +01:00
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
kikito
430507ec1e Adds budget_lines.selected 2016-12-22 20:24:59 +01:00
rgarcia
25729ac259 cleans up 2016-12-21 18:55:28 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
rgarcia
53ac18f68f updates views 2016-12-20 17:06:03 +01:00