Commit Graph

780 Commits

Author SHA1 Message Date
kikito
183f8432eb Merge branch 'polls' into polls-question-show 2017-01-26 11:36:34 +01:00
kikito
d9351b123d prints a button to redirect to the poll when a question is answerable 2017-01-25 17:58:09 +01:00
Amaia Castro
53d13d8524 Create a new comment instead of a new annotation with the same ranges 2017-01-25 16:04:10 +01:00
Alberto Miedes Garcés
e3fca5c49f Remove functionality related to votes demographic info
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
2017-01-25 13:37:29 +01:00
Juanjo Bazán
5806d86e33 changes poll_voters to optionally reference an answer
adds indexes for poll_voters
2017-01-25 12:57:00 +01:00
Juanjo Bazán
6bc4f5b307 adds Poll::Answer model for web users
PartialResults is kept for booth results
2017-01-25 12:46:44 +01:00
Juanjo Bazán
900563e31c adds poll_id and stats fields to poll_voters 2017-01-25 12:03:48 +01:00
kikito
8dbc72c374 moves geozones from poll question to poll in dev_seeds 2017-01-20 18:58:19 +01:00
kikito
063c94822d Removes all_geozones from poll_questions table 2017-01-20 17:47:49 +01:00
kikito
d53c867ba4 Adds geozone_restricted to polls 2017-01-20 17:45:11 +01:00
kikito
67c287dc14 Migrates geozones from poll questions to polls 2017-01-20 16:50:03 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
rgarcia
537de8c46c Merge branch 'master' into budget-emails 2017-01-15 18:58:20 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
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
Alberto Miedes Garcés
a31f6be3bd Add proposal notifications to seeds 2017-01-07 22:16:17 +01:00
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