Bertocq
ad986e600e
Merge branch 'master' into feature/1929#add_shift_task_usage
2017-10-03 12:01:21 +02:00
Bertocq
3a17c74f2c
Merge branch 'master' into chore/remove_results
2017-10-03 11:42:57 +02:00
Bertocq
9432cd77d8
Merge branch 'master' into chore/update_secrets_example
2017-10-03 11:42:42 +02:00
Bertocq
ccb80ce967
Fix recount spec to take into account already existing values and mandatory officer_assigment
2017-10-03 11:40:36 +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
5c4fb1bef3
Merge branch 'master' into chore/update_secrets_example
2017-10-03 00:22:18 +02:00
Bertocq
6c998768e8
Fix Poll Recount model spec after default amount value added
2017-10-03 00:19:12 +02:00
BertoCQ
19e8ec265f
Merge branch 'master' into chore/remove_results
2017-10-02 23:54:13 +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
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +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
BertoCQ
01107e2257
Merge pull request #1968 from consul/fix/recount_default_amounts
...
Set default 0 for Poll Recount amounts
2017-10-02 21:19:53 +02:00
Bertocq
d401a2cd92
Add default 0 value for Poll Recount amounts
2017-10-02 21:16:22 +02:00
María Checa
e464985114
Minor fix
...
Removed unnecessary markdown
2017-10-02 20:34:38 +02:00
Bertocq
5aa063668f
Remove no longer used befor block with comments
2017-10-02 19:57:02 +02:00
Bertocq
9260561332
Update deploy secrets example file
2017-10-02 17:55:59 +02:00
Bertocq
bc92b8d2cd
Update secrets.yml.example file
2017-10-02 17:52:13 +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
María Checa
c0dcedcd0f
Tests fix
2017-10-02 16:39:09 +02:00
Bertocq
d60b92121a
Merge branch 'master' into chore/remove_results
2017-10-02 16:39:02 +02:00
BertoCQ
890f6720e5
Merge pull request #1963 from consul/chore/poll_recount
...
Swap Poll White/Null/Total Results for Poll Recount
2017-10-02 16:38:38 +02:00
Bertocq
58069b35a3
Remove Poll White/Null/Total Results models, tables, specs and references
2017-10-02 16:24:57 +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
María Checa
afbdd48891
Fixed tests
2017-10-02 16:11:17 +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
iagirre
ca42bc9845
Added schema.rb with new columns for polls summary and description
2017-10-02 13:28:44 +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
iagirre
166caa3b4c
Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
...
Added missing text for english and new texts in english and spanish.
Cambios para hacer commit:
modificado: app/assets/stylesheets/participation.scss
modificado: app/models/concerns/imageable.rb
modificado: app/models/poll.rb
modificado: app/views/admin/poll/polls/_form.html.erb
modificado: app/views/images/_admin_image.html.erb
modificado: config/locales/en/images.yml
modificado: config/locales/es/admin.yml
modificado: config/locales/es/images.yml
modificado: spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
Bertocq
5c513d8051
Fix typo on general proposal share text
2017-10-02 12:30:31 +02:00
decabeza
f497227e3f
improves layout for polls index view
2017-10-02 12:24:31 +02:00
Pedro
1e4862d1cb
Merge pull request #2 from consul/master
...
Merge 02/10/17
2017-10-02 12:23:00 +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
BertoCQ
c3d5041717
Merge pull request #1945 from consul/depfu/upgrade/byebug-9.1.0
...
Upgrade byebug to version 9.1.0
2017-09-30 09:30:03 +02:00
Raimond Garcia
f68d86a2e5
Merge pull request #1824 from rockandror/user-recomendations
...
User recomendations
2017-09-29 19:02:03 +02:00
iagirre
c67620fdef
Table for links added (links to add images/documents).
...
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
2017-09-29 14:51:49 +02:00
