Commit Graph

1823 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
98db33f623 Track email digests 2017-01-05 23:31:11 +01:00
kikito
248755a801 Modifies the investment orders shown by phase 2017-01-05 17:38:36 +01:00
kikito
28e6a10382 Hides balloting controls when not in the balloting phase 2017-01-05 15:17:49 +01:00
rgarcia
c3380d18fa fixes conflicts with budgets 2017-01-05 13:14:09 +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
Juanjo Bazán
0e9cec2ca6 adds spec for recount/officers lists in booth_assignment show 2017-01-05 13:00:48 +01:00
kikito
5f108944a8 final attempt at fixing travis 2017-01-05 12:49:53 +01:00
kikito
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +01:00
Fernando Blat
de13574617 Show link to the first question 2017-01-05 12:31:20 +01:00
kikito
2a792a5499 attempts to fix failing spec in travis 2017-01-05 12:05:40 +01:00
kikito
9e2afeb503 removes deprecated spec (valuators are not shown in valuation table) 2017-01-05 11:26:46 +01:00
Fernando Blat
814cf9df56 Show creation date and status in admin list 2017-01-05 10:22:40 +01:00
Fernando Blat
fba4c79d2a Show the first paragraph of the description 2017-01-05 09:43:40 +01:00
Fernando Blat
0c5063add9 Show message when there aren't processes 2017-01-05 09:36:08 +01:00
Fernando Blat
71ed50928f Merge pull request #53 from medialab-prado/46-validate-legislation-process-dates
Validate date ranges for legislation process
2017-01-05 09:25:10 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
Juanjo Bazán
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
Alberto Garcia Cabeza
a42c1387cf fixes specs 2017-01-04 19:38:49 +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
kikito
e9acf295b8 removes filter specs after removing filtering from valuation 2017-01-04 17:00:56 +01:00
kikito
4ceeb68a90 changes abilities extending valuation period 2017-01-04 15:59:36 +01:00
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
kikito
f5dcb51d37 Adds valid_heading validation to budget line. Renames validation methods. 2017-01-04 13:56:42 +01:00
Juanjo Bazán
909dce00e0 adds recounting spec 2017-01-04 13:52:11 +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
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +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
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
c2a61096aa adds required date to recount factory
fixes recount spec
2017-01-03 23:02:58 +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
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
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
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +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
Juanjo Bazán
fe1c12c661 updates count_log if recount count value changes 2017-01-02 13:36:30 +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