Commit Graph

7804 Commits

Author SHA1 Message Date
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
Alberto Garcia Cabeza
e8dafde39f adds message for not logged users 2017-01-05 13:03:11 +01:00
Juanjo Bazán
0e9cec2ca6 adds spec for recount/officers lists in booth_assignment show 2017-01-05 13:00:48 +01:00
Fernando Blat
ed714f7c7d Add flash messages. Redirect to edit action after update 2017-01-05 12:56:55 +01:00
Alberto Garcia Cabeza
01ba8f7ea9 improves styles on budgets groups show 2017-01-05 12:56:46 +01:00
Fernando Blat
6c8060af38 Check the field is present before validating it 2017-01-05 12:45:27 +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
Fernando Blat
450fcc3e04 Use SQL to sum the comments 2017-01-05 11:14:12 +01:00
Fernando Blat
ba0089ac44 Truncate social networks text 2017-01-05 11:05:45 +01:00
Fernando Blat
7100156b28 Show full header when click on expand button 2017-01-05 10:55:53 +01:00
Fernando Blat
48764d757c Fix label markup 2017-01-05 10:29:21 +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
186be1e7cc adds booth_assignments controller to admin menu 2017-01-04 21:00:55 +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
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
Alberto Garcia Cabeza
9c2857e75b changes budget color 2017-01-04 19:17:58 +01:00
Alberto Garcia Cabeza
ef1300abbc removes unused scss 2017-01-04 19:17:51 +01:00
kikito
635de83f86 prints the right value in budgets table 2017-01-04 18:48:01 +01:00
kikito
0835a7aba6 fixes valuation subtitle in budget investments index 2017-01-04 18:24:15 +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
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +01:00
Alberto Garcia Cabeza
fa7d6c18fd fixes back links on valuation budgets 2017-01-04 17:33:59 +01:00
Alberto Garcia Cabeza
74a361690d improves styles for valuation budgets 2017-01-04 17:33:09 +01:00
kikito
8aa982725e Renames "Vote" to "Give support" during the support phase 2017-01-04 17:10:56 +01:00
Alberto Garcia Cabeza
02359c8e2a improves styles for admin budgets edit 2017-01-04 17:04:37 +01:00
Alberto Garcia Cabeza
46d96e5a18 improves styles for admin budgets show 2017-01-04 17:02:27 +01:00
kikito
9c66fa0dc8 removes filter from valuation index page 2017-01-04 16:31:16 +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
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +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
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +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
39633dce67 Fix back links in admin 2017-01-04 12:39:09 +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
c935373c07 Remove draft version preview buttons from edit form and add link to index 2017-01-04 10:14:58 +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
0953a536af adds recounting to officing 2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +01:00