María Checa
2020990b05
Merge pull request #1972 from consul/1954-remove_question_show_and_description
...
Removed poll question show view and description attribute
2017-10-04 12:52:46 +02:00
María Checa
5b7a90221a
Fixed tests
2017-10-04 11:18:09 +02:00
Bertocq
15039b6c5d
Load the Booth polls instead of all current/incoming on Shift creation for date ranges
2017-10-04 11:02:09 +02:00
María Checa
8dc05d399b
Fixed tests
2017-10-04 10:03:44 +02:00
Bertocq
85087b0bea
Check officer value for Poll Voter created from officing panel
2017-10-04 01:09:51 +02:00
María Checa
80c8fa308f
Merge branch 'master' into 1954-remove_question_show_and_description
2017-10-03 22:33:08 +02:00
María Checa
81e9682aa3
Fixed tests
2017-10-03 22:30:15 +02:00
Raimond Garcia
c7f576aa4f
Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
...
Iagirre admin polls section
2017-10-03 22:23:53 +02:00
María Checa
ac1d2e3aec
Merge pull request #1960 from consul/polls_minor_changes
...
Requested polls admin section improvements
2017-10-03 21:36:08 +02:00
Bertocq
825671ad9b
Fix polls answer this question show text
2017-10-03 18:53:44 +02:00
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
María Checa
2cb620296b
Fixed test
2017-10-03 15:49:03 +02:00
Bertocq
0384baf26a
Unify both Shift task type creation on a single scenario to check double task on same day
2017-10-03 13:29:26 +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
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
rgarcia
085991c624
allows voting only in one origin: booth or web
2017-10-02 16:22:31 +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
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
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
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
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
966ff4dc03
User new direct uploads controllers action on imageable.
2017-09-26 13:56:06 +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
16692c933e
Move specs from imageable shared feature spec to proposals and budget investments path.
2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
ceabd16d57
Refactor. Create index scope inside imageable shared examples to check index action of any imageable model. Add image to proposals index.
2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
3310089208
Add nested imageable shared spec to check nested images behavior at imageable any recipients.
2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
6f71da07ee
Duplicate documentable code and rename for imageable
2017-09-26 13:55:03 +02:00
Bertocq
614ff79ba1
WIP
2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
e7ac27a2b8
Add missing specs to check validation errors on new investmentand edit image pages.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c914c772c0
Add budget investment image dimmensions validator.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
1327b7276d
Create investments helper. Fix indentation error and some specs names and structure.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4469aa9b32
Allow to remove budget investment image from edit image page to authors and administrators.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
0925d33c5b
Add dynamic texts to investment image button.
2017-09-26 13:53:42 +02:00
