Commit Graph

1408 Commits

Author SHA1 Message Date
Juanjo Bazán
a05297ea1a adds Recounting tab to Poll's admin show view 2017-01-31 13:40:53 +01:00
Juanjo Bazán
547168be3f adds recounts to poll_officer view in admin zone
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
2017-01-31 12:38:53 +01:00
Raimond Garcia
b0bc97eb37 Merge pull request #1378 from consul/recounting
Final recounts info to Admin
2017-01-30 21:54:35 +01:00
Juanjo Bazán
4ee50c86c0 adds final recounts info to admins 2017-01-30 20:42:30 +01:00
kikito
bc763c34c2 Removes Poll::Question.summary from views 2017-01-30 18:41:24 +01:00
Juanjo Bazán
05f054ece4 adds final recount/results shift for officers from Admin 2017-01-30 17:44:39 +01:00
Juanjo Bazán
e634e80113 adds system recounting to admin booth_assignments 2017-01-27 15:19:03 +01:00
Juanjo Bazán
ce7bac4a59 Merge branch 'master' into polls 2017-01-26 13:16:03 +01:00
Juanjo Bazán
b1a5a324c7 adds missing checkbox label for unfeasible investments 2017-01-26 13:15:43 +01:00
kikito
ab63c18d01 Moves geozones from questions to polls in admin show views 2017-01-24 18:08:48 +01:00
kikito
176a190149 Moves geozones from questions to polls in admin forms 2017-01-24 18:08:15 +01:00
Fernando Blat
f7a6f8399b Add pending translations 2017-01-23 14:58:12 +01:00
Martín González
deb9d2a508 Fix typo 2017-01-23 14:25:51 +01:00
Martín González
dca072beaf Hide legislation text when the full-screen editor is not active 2017-01-23 12:55:05 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
536784ee04 Merge pull request #72 from medialab-prado/back-improvements
Back improvements
2017-01-19 10:27:12 +01:00
Fernando Blat
6560e77554 Ask for confirmation when changing the page and
the forms watched do have changes
2017-01-18 13:37:11 +01:00
Fernando Blat
1537dd41da Add forms placeholders 2017-01-18 11:46:19 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
4a5276f089 Revert change in admin namespace helper and redefine it in the controller 2017-01-11 15:43:46 +01:00
Juanjo Bazán
bdb55805a1 uses back_link_helper all around 2017-01-11 13:03:12 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +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
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +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
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
kikito
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +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
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +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
c935373c07 Remove draft version preview buttons from edit form and add link to index 2017-01-04 10:14:58 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Amaia Castro
d29a9fe761 Match js calendar date format in admin process form text fields 2017-01-02 13:22:33 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
kikito
9e4b2fda89 Adds phases to form 2017-01-01 15:03:58 +01:00
Amaia Castro
ab12ffe98f Titles for legislation admin pages 2016-12-30 12:03:11 +01:00
Amaia Castro
4c309b5243 Refactor css classes 2016-12-30 11:22:28 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Alberto Garcia Cabeza
73e3ea3560 fixes specs 2016-12-29 19:16:20 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
kikito
55ea9f1089 replaces unicode by yes/no 2016-12-29 12:11:31 +01:00
kikito
d2356c18d0 Adds toggle_selection action 2016-12-28 19:11:59 +01:00
Amaia Castro
28689a5a7d Merge branch 'legislation-module-stable' into 27-answer-questions 2016-12-28 17:54:21 +01:00