Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
rgarcia
|
4d5b885b7e
|
sets spending proposal's settings to nil
|
2017-01-10 20:13:48 +01:00 |
|
Juanjo Bazán
|
be0cbb9ea1
|
adds setting to dev_seeds values
|
2017-01-09 16:05:33 +01:00 |
|
Juanjo Bazán
|
220e7397e1
|
adds Setting: minimum age to participate
|
2017-01-09 16:04:49 +01:00 |
|
Amaia Castro
|
b8f034d896
|
Legislation annotations/comments page
|
2017-01-09 09:29:15 +01:00 |
|
rgarcia
|
64366ba1f6
|
tmp fix for heading geozones
|
2017-01-08 20:03:30 +01:00 |
|
kikito
|
3c9e08b06f
|
Adds organization_name attribute to budget investments
|
2017-01-06 18:43:55 +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 |
|
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 |
|
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 |
|
Amaia Castro
|
5627b18be2
|
Draft Version page
|
2017-01-02 18:05:15 +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 |
|
Amaia Castro
|
5e01b380cd
|
Legislation Answer model
|
2016-12-27 18:21:50 +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 |
|
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 |
|
rgarcia
|
25868ee5eb
|
fixes conflicts
|
2016-12-20 16:55:07 +01:00 |
|
rgarcia
|
4eb700e3d4
|
refactors signature sheets
|
2016-12-20 16:46:08 +01:00 |
|
Alberto Garcia Cabeza
|
7e9b903622
|
adds setting signature sheets on dev_seeds
|
2016-12-20 14:57:43 +01:00 |
|
rgarcia
|
7ec6a874b6
|
updates seeds with signature sheet feature
|
2016-12-20 12:25:34 +01:00 |
|
rgarcia
|
7d3cb112ac
|
updates seeds
|
2016-12-20 12:21:23 +01:00 |
|
rgarcia
|
3c682b8a9b
|
adds signature sheets
|
2016-12-20 12:21:05 +01:00 |
|
Amaia Castro
|
e4315f94c8
|
Merge branch 'master' into legislation-module-stable
|
2016-12-15 11:26:22 +01:00 |
|
Amaia Castro
|
400b510b71
|
Store the processed html from the markdown text body field
|
2016-12-14 11:32:28 +01:00 |
|
Alberto Miedes Garcés
|
c2006526c9
|
Better way to set geozone codes when seeding
|
2016-12-13 12:40:11 +01:00 |
|