Bertocq
690ebfba01
Check Shift destroy also destroy only associated OfficerAssigments
2017-10-03 13:24:07 +02:00
Bertocq
c624129175
Check Shift creates final/not-final OfficerAssigments correctly
2017-10-03 12:57:40 +02:00
Bertocq
3a17c74f2c
Merge branch 'master' into chore/remove_results
2017-10-03 11:42:57 +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
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
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
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
5aa063668f
Remove no longer used befor block with comments
2017-10-02 19:57:02 +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
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
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
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
Raimond Garcia
f68d86a2e5
Merge pull request #1824 from rockandror/user-recomendations
...
User recomendations
2017-09-29 19:02:03 +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
Bertocq
3da4ee4ee3
Check Poll Shift creation date ranges are correct
2017-09-28 12:18:47 +02:00
Bertocq
49b4af5e04
Add flash error for shift creation without date, increase spec
2017-09-28 10:53:15 +02:00
Bertocq
13aa5a3ba8
Increase Admin Shift creation scenarios for both tasks options
2017-09-27 18:47:06 +02:00
taitus
a0603985ef
Refactor.
2017-09-27 14:51:35 +02:00
taitus
51c53b6f31
Add missing specs from Maps on New, Edit and Show.
2017-09-27 14:50:54 +02:00
taitus
7b54451491
Add missing specs on admin
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
011ef41ae1
Add map location missing specs
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
130e4533ac
Allow to render map without marker on new forms.
2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
6c1d1c2cde
Add map settings to backend. Install leaflet assets to render maps.
2017-09-27 14:46:02 +02:00
Senén Rodero Rodríguez
2993ef8707
Remove documents single uploads
2017-09-27 11:04:56 +02:00
Senén Rodero Rodríguez
eef8ad1b73
Remove images single uploads
2017-09-27 10:41:48 +02:00
Senén Rodero Rodríguez
92f66a6db9
Fix rpspec styub deprecated syntax
2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
1a8fda9352
Fix broken specs
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76
Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs.
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
f8d78ec4ab
Remove new_nested action from images controller. Use cocoon gem to manage new nested fields creation on images.
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
88a7a29d27
Remove new_nested action from documents controller. Use cocoon gem to manage new nested fields creation on documents.
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
95016a1bf3
Some renaming and cleaning
2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
4457a55a9a
Add direct upload model specs
2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
661bdda41f
Stronger direct upload model specs
2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
baf9ce90a9
Obfuscate documentable and imageable file names.
2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
966ff4dc03
User new direct uploads controllers action on imageable.
2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
824dd26d5a
User new direct uploads controllers action on documentable. Skipped spec.
2017-09-26 13:55:51 +02:00
Senén Rodero Rodríguez
826385f659
Extract ajax upload and destroy_upload actions from images and documents controllers and place them at new controllers to manage direct uploads
2017-09-26 13:55:28 +02:00
Senén Rodero Rodríguez
c6dabedb4a
Add missing image model spec. Add shared specs to check image validations at any imageable model
2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
d1d2a31876
Remove permissions of obsolete actions. Add missing image managment abilities to common and administrator specs.
2017-09-26 13:55:03 +02:00
