Commit Graph

5807 Commits

Author SHA1 Message Date
Juanjo Bazán
594ad3df7b adds basic new view for officing results 2017-02-02 11:53:57 +01:00
Juanjo Bazán
aa6eee6df0 Merge pull request #1385 from consul/polls-design
polls design
2017-02-01 18:33:19 +01:00
rgarcia
2d0756ef1d updates translations for year birth 2017-02-01 11:20:22 +01:00
Alberto Garcia Cabeza
8c4541d50f shows always questions lists and button to participate on poll index 2017-01-31 21:08:03 +01:00
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
Juanjo Bazán
0c34c030e9 adds missing i18n text 2017-01-31 11:41:18 +01:00
Juanjo Bazán
abf40812b1 changes copy for officers menu items 2017-01-31 11:31:23 +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
Juanjo Bazán
70d00a9768 adds all recounts to offering final recounts list
so poll officers can compare
2017-01-30 20:16:02 +01:00
kikito
7fa413b6df i18n 2017-01-30 19:05:16 +01:00
Juanjo Bazán
72ac75abeb adds final recounting to poll officers' zone 2017-01-30 17:44:39 +01:00
Juanjo Bazán
05f054ece4 adds final recount/results shift for officers from Admin 2017-01-30 17:44:39 +01:00
Raimond Garcia
886c179a71 Merge pull request #1375 from consul/officer-document-check
updates styles and i18n for officing views
2017-01-30 14:03:04 +01:00
Raimond Garcia
bc0a4d65b4 Merge pull request #1374 from consul/polls-index
Polls index
2017-01-30 13:52:48 +01:00
Alberto Garcia Cabeza
1977b23803 updates styles and i18n for officing views 2017-01-30 13:33:38 +01:00
kikito
c1345a1f7d Includes reason for not being able to participate in poll index 2017-01-30 11:30:39 +01:00
rgarcia
c74587d921 fixes specs 2017-01-29 14:13:24 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Alberto Miedes Garcés
6b47ce065f Fix buggy associations 2017-01-27 14:27:28 +01:00
Alberto Miedes Garcés
073ce38a8d Improved API docs autogeneration 2017-01-27 12:39:44 +01:00
Alberto Miedes Garcés
4b7cebf686 Improved public_for_api scopes and corresponding specs 2017-01-26 18:29:59 +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
Alberto Miedes Garcés
5b7cbccd19 Merge branch 'master' into api-dev 2017-01-26 12:39:59 +01:00
kikito
183f8432eb Merge branch 'polls' into polls-question-show 2017-01-26 11:36:34 +01:00
Alberto Miedes Garcés
0c00b53765 Add Vote vote_flag field to API 2017-01-26 10:59:46 +01:00
Alberto Miedes Garcés
e8fc387574 Add Organization to API 2017-01-26 10:57:02 +01:00
Alberto Miedes Garcés
69fc161b83 Show taggings in API 2017-01-26 10:48:05 +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
Juanjo Bazán
754095f4d0 fixes modified i18n key 2017-01-25 17:15:38 +01:00
Juanjo Bazán
b13a76963a records participation of user via web
answering a poll question creates a voter with the user data to record
participation in question’s poll
2017-01-25 14:21:03 +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
kikito
25930563e9 adds missing i18n 2017-01-25 10:15:38 +01:00
kikito
e935629fdb i18n 2017-01-24 19:01:28 +01:00
kikito
6ed73f34b6 Adds activerecord translations 2017-01-24 18:10:30 +01:00
Fernando Blat
f7a6f8399b Add pending translations 2017-01-23 14:58:12 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
1af047089f Add form to publish a new first level comment from the comments box 2017-01-19 15:42:50 +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
Fernando Blat
5c3f87c4a2 Merge pull request #70 from medialab-prado/reorganize-locale-files
Change comments texts in legislation questions
2017-01-17 16:39:08 +01:00
Amaia Castro
6c36fde6cc Merge branch 'master' into legislation-module-stable 2017-01-17 15:45:33 +01:00
Amaia Castro
53e9837db3 Change texts for legislation questions comments 2017-01-17 15:42:42 +01:00
Amaia Castro
108d788985 Extract legislation translations to another yml file 2017-01-17 10:58:33 +01:00
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
Amaia Castro
65fcd83ee5 Don’t show new annotation/comment form if allegations phase is not open 2017-01-16 19:06:06 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +01:00