Commit Graph

1770 Commits

Author SHA1 Message Date
Raimond Garcia
4c818bfcc4 Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
2017-01-13 18:34:31 +01:00
rgarcia
b2b9954e6d allows user to support only in one heading per group 2017-01-13 15:24:57 +01:00
rgarcia
470fe41585 only displays vote button in selecting phase 2017-01-13 11:13:01 +01:00
Alberto Miedes Garcés
f2eb8724d3 Remove duplicated scopes 2017-01-13 00:54:52 +01:00
Alberto Miedes Garcés
d1f14ffb93 Simplify the way GraphQL 'resolve' is used 2017-01-12 19:51:58 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00
Juanjo Bazán
b71bcdd4b5 adds permissions to comment Investments as admin/moderator 2017-01-10 14:31:02 +01:00
Juanjo Bazán
f102f9f753 adds Budget::Investment to valid commentable types 2017-01-10 13:30:30 +01:00
Amaia Castro
f43f13e826 Create first comment automatically from the annotation 2017-01-09 17:03:00 +01:00
Juanjo Bazán
e2118f701b removes hardcoded age, favours setting 2017-01-09 16:05:27 +01:00
Juanjo Bazán
220e7397e1 adds Setting: minimum age to participate 2017-01-09 16:04:49 +01:00
Alberto Miedes Garcés
6940b90260 Add more fields to api.yml 2017-01-09 14:11:51 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
Amaia Castro
b8f034d896 Legislation annotations/comments page 2017-01-09 09:29:15 +01:00
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +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
248755a801 Modifies the investment orders shown by phase 2017-01-05 17:38:36 +01:00
rgarcia
c3380d18fa fixes conflicts with budgets 2017-01-05 13:14:09 +01:00
Fernando Blat
6c8060af38 Check the field is present before validating it 2017-01-05 12:45:27 +01:00
Fernando Blat
de13574617 Show link to the first question 2017-01-05 12:31:20 +01:00
Fernando Blat
450fcc3e04 Use SQL to sum the comments 2017-01-05 11:14:12 +01:00
Fernando Blat
814cf9df56 Show creation date and status in admin list 2017-01-05 10:22:40 +01:00
Amaia Castro
bc1905e5d9 Validate date ranges for legislation process
Only validates start and end dates for the whole process or a phase, not overlap between phases, as they are permitted, at least for now.
2017-01-04 18:13:28 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
kikito
4ceeb68a90 changes abilities extending valuation period 2017-01-04 15:59:36 +01:00
kikito
b289e21992 Refactors valid_heading 2017-01-04 13:56:54 +01:00
kikito
f5dcb51d37 Adds valid_heading validation to budget line. Renames validation methods. 2017-01-04 13:56:42 +01:00
kikito
08586d521b Refactors heading.budget . adds heading.budget_id 2017-01-04 13:54:07 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Amaia Castro
375602d297 Display title with an * when status is draft in version chooser 2017-01-04 12:15:12 +01:00
Amaia Castro
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +01:00
Juanjo Bazán
2886d6d954 adds relations to officer/booth assignments 2017-01-03 22:20:22 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Juanjo Bazán
8b56403bb1 adds validations and info logging to Recount 2017-01-03 21:35:04 +01:00
kikito
52d182f099 Removes geozone from budget heading 2017-01-03 18:51:21 +01:00
Amaia Castro
d2b3a21182 Fix abilities and add specs 2017-01-03 17:48:21 +01:00
kikito
5ac2d9ccc9 started working on tags for budget investments. Error in investments/show because paths are hard 2017-01-03 17:13:28 +01:00
Amaia Castro
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Juanjo Bazán
b3fd7ffafa adds assigned_polls method to poll_officer 2017-01-02 20:28:16 +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
Amaia Castro
1ff6a7b69b Merge branch 'legislation-module-stable' into 42-integrate-admin-html-css 2017-01-02 18:03:55 +01:00
Alberto Miedes Garcés
0b4004042f Expose age_range instead of date_of_birth for Voter/User class 2017-01-02 14:12:37 +01:00
Juanjo Bazán
fe1c12c661 updates count_log if recount count value changes 2017-01-02 13:36:30 +01:00
Juanjo Bazán
85b8f54570 adds Poll::Recount 2017-01-02 13:34:53 +01:00