María Checa
|
05d40c0ede
|
Merge branch 'master' into polls_minor_changes
|
2017-10-03 16:22:33 +02:00 |
|
Bertocq
|
fc5ff61365
|
Destroy all related OfficerAssignments when destroying a Shift
|
2017-10-03 12:30:42 +02:00 |
|
Bertocq
|
332b9be94a
|
Reorder before/after create methods
|
2017-10-03 12:26:43 +02:00 |
|
Bertocq
|
34fbf1472c
|
Join in a single validation both Shift date validates statements
|
2017-10-03 12:26:04 +02:00 |
|
Bertocq
|
4e85e136d1
|
Remove OfficerAssignment composed index
|
2017-10-03 12:02:30 +02:00 |
|
Bertocq
|
ad986e600e
|
Merge branch 'master' into feature/1929#add_shift_task_usage
|
2017-10-03 12:01:21 +02:00 |
|
María Checa
|
e6b5de77fe
|
Removed files that are not being used
|
2017-10-03 10:50:18 +02:00 |
|
María Checa
|
bf61dffd4b
|
Removed files that are not used
|
2017-10-03 10:47:48 +02:00 |
|
Bertocq
|
6c998768e8
|
Fix Poll Recount model spec after default amount value added
|
2017-10-03 00:19:12 +02:00 |
|
Bertocq
|
9ae72387fe
|
Remove remove_question ability from admin on Poll
|
2017-10-02 23:29:57 +02:00 |
|
BertoCQ
|
fbbbd38932
|
Merge pull request #1965 from consul/polls-voting
Polls voting
|
2017-10-02 22:25:51 +02:00 |
|
BertoCQ
|
356eb4ca8a
|
Merge pull request #1959 from consul/polls-index
Polls index view
|
2017-10-02 21:42:59 +02:00 |
|
BertoCQ
|
1b4f6d5cae
|
Merge pull request #1938 from consul/imageable-polish
Imageable polish
|
2017-10-02 21:42:15 +02:00 |
|
BertoCQ
|
01e4447050
|
Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results
Admins can see the preview of the budgets' results before the balloti…
|
2017-10-02 21:40:04 +02:00 |
|
María Checa
|
e464985114
|
Minor fix
Removed unnecessary markdown
|
2017-10-02 20:34:38 +02:00 |
|
Raimond Garcia
|
a743b6b823
|
Merge branch 'master' into polls-voting
|
2017-10-02 17:11:21 +02:00 |
|
BertoCQ
|
7f936f440c
|
Merge branch 'master' into polls_minor_changes
|
2017-10-02 16:44:53 +02:00 |
|
rgarcia
|
085991c624
|
allows voting only in one origin: booth or web
|
2017-10-02 16:22:31 +02:00 |
|
rgarcia
|
0147401fbe
|
adds origin to poll voters
|
2017-10-02 16:18:08 +02:00 |
|
Bertocq
|
b5cf28cb35
|
Swap Poll White/Null/Total usage for Poll Recount
|
2017-10-02 15:46:49 +02:00 |
|
Bertocq
|
6c297ae789
|
Add Poll Recount model, factory and spec
|
2017-10-02 14:57:40 +02:00 |
|
Bertocq
|
9d7be9b57c
|
Sort Shift recount and scrutiny dates
|
2017-10-02 13:46:02 +02:00 |
|
Bertocq
|
35f6a5bb65
|
Add task to unique triple index on Shift for booth, officer and task
|
2017-10-02 13:45:19 +02:00 |
|
rgarcia
|
60fb142fff
|
adds comprehensive validation specs
|
2017-10-02 13:39:55 +02:00 |
|
rgarcia
|
b623422805
|
allows users to change their vote without refreshing the page
|
2017-10-02 13:14:58 +02:00 |
|
Bertocq
|
1c85c8af79
|
Sort Shift recount and scrutiny dates
|
2017-10-02 13:08:55 +02:00 |
|
decabeza
|
f497227e3f
|
improves layout for polls index view
|
2017-10-02 12:24:31 +02:00 |
|
María Checa
|
799e2475da
|
Polls booth assignments fixes
Poll booth preview now renders recounts tab by default instead of the officers one.
|
2017-10-02 11:08:18 +02:00 |
|
María Checa
|
2c72a054ac
|
Polls admin officer assignments fixes
Removed total results table from officer assignment as now there are only final results.
|
2017-10-02 11:04:37 +02:00 |
|
María Checa
|
2365ec96fa
|
Polls admin officers tab fixes
Removed actions offered in search results.
|
2017-10-02 10:41:48 +02:00 |
|
María Checa
|
adf18ee756
|
Polls admin fixes
Removed search from questions tab and unassign button.
|
2017-10-02 10:37:10 +02:00 |
|
María Checa
|
fd1d09c8c2
|
Booths and shifts index pages minor fixes
Showing only actions to assign and edit shifits in shifts index, and option to create a new booth in booths index.
|
2017-10-02 10:25:11 +02:00 |
|
Raimond Garcia
|
f68d86a2e5
|
Merge pull request #1824 from rockandror/user-recomendations
User recomendations
|
2017-09-29 19:02:03 +02:00 |
|
Bertocq
|
07592f6b0d
|
Correct Poll current/expired/incoming scopes and helper functions
|
2017-09-29 11:50:23 +02:00 |
|
decabeza
|
1a0467d2c6
|
adds data equalizer watch to prevent js errors
|
2017-09-29 09:23:05 +02:00 |
|
decabeza
|
f44f3f5bc1
|
fixes css to shows error messages correctly
|
2017-09-28 17:52:28 +02:00 |
|
María Checa
|
14fe771fa5
|
Fixed wrong officer action path
Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct.
|
2017-09-28 17:47:50 +02:00 |
|
María Checa
|
1e0aec37ab
|
Removed link to poll question in the web in admin section
|
2017-09-28 17:37:31 +02:00 |
|
Alessandro Cuoghi
|
20fd176b6a
|
Change again margin-top to button.hollow
|
2017-09-28 17:13:45 +02:00 |
|
Alessandro Cuoghi
|
4eee5f6eba
|
Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded.
|
2017-09-28 17:03:50 +02:00 |
|
decabeza
|
876a2b530b
|
fixes lint warnings
|
2017-09-28 16:03:08 +02:00 |
|
decabeza
|
fd78eb30cc
|
shows hr tag on forms only when expanded
|
2017-09-28 15:20:47 +02:00 |
|
decabeza
|
8aaa0cb718
|
adds data equalizer to fix height on items with images
|
2017-09-28 15:20:00 +02:00 |
|
Senén Rodero Rodríguez
|
92c774cdeb
|
Merge with master
|
2017-09-28 13:36:20 +02:00 |
|
BertoCQ
|
121109f967
|
Merge branch 'master' into feature/1924#poll_shifts_creation
|
2017-09-28 13:03:34 +02:00 |
|
Raimond Garcia
|
e590e31053
|
Merge pull request #1864 from rockandror/maps-frontend
Maps frontend
|
2017-09-28 12:53:17 +02:00 |
|
Bertocq
|
49b4af5e04
|
Add flash error for shift creation without date, increase spec
|
2017-09-28 10:53:15 +02:00 |
|
María Checa
|
08cdf93ecc
|
Switch date selects for shift tasks
|
2017-09-28 10:40:48 +02:00 |
|
decabeza
|
fff643db8c
|
improves delete image button on proposal show
|
2017-09-28 09:16:08 +02:00 |
|
decabeza
|
33d9d2d005
|
adds new icon image
|
2017-09-28 09:15:46 +02:00 |
|