María Checa
85695d51bb
Changed translations "blank ballots" for "totally blank ballots"
2017-10-04 11:52:09 +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
1afd97b687
Removed unnused translations
2017-10-03 12:09:02 +02:00
BertoCQ
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +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
María Checa
afbdd48891
Fixed tests
2017-10-02 16:11:17 +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
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
iagirre
77d0a551cf
Migration for adding summary and description to polls created. Both text_areas were added to polls form.
...
Imageable class included in polls model and the first aproach for adding images added to form.
2017-09-28 17:46:30 +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
decabeza
c8341fc5f1
adds missing translation
2017-09-27 18:08:01 +02:00
Senén Rodero Rodríguez
5815389cb8
Rename map settings keys
2017-09-27 14:49:07 +02:00
Senén Rodero Rodríguez
874a951dd2
Add map locations helper. Allow to configure map marker edition on map instantiation at views.
2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
5956207a00
Add map locations. Each map location can belongs to proposal or budget investment.
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
Bertocq
ce92dcd088
Add Task selection on Poll Shift creation, and on shifts table
2017-09-27 14:05:25 +02:00
Senén Rodero Rodríguez
6c1d828a62
Remove unneded code
2017-09-27 11:38:38 +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
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
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
2a12b222ed
Fix some tranlations on new image page. Add missing shared specs for imageable feature.
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
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
8ce237805c
Add forgotten translation to locale files.
2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
60b3eac305
Relocate some locale entries.
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
4469aa9b32
Allow to remove budget investment image from edit image page to authors and administrators.
2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
6cde1c1c10
Added upload image button. Created function to show file upload name. Added translation.
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
Senén Rodero Rodríguez
51d1031afa
Add recomendations to edit image page with english and spanish translations.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
acc79cbe31
Add edit_image and update_image action to budget/investments controller.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
515d6d7e70
Rename image_description column to image_title on budget investments.
2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
673fc66011
Add budget investements images specs
2017-09-26 13:53:42 +02:00
BertoCQ
f2e44f0730
Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals
...
Remove Officer recounts, add Final&Totals votes
2017-09-26 10:19:57 +02:00
Bertocq
ee7ef6e2df
Normalize some i18n files
2017-09-25 23:02:54 +02:00
Bertocq
bf981ca828
Remove Booth Assignment officer totals and add final&system counts
2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62
Merge pull request #1875 from consul/admin-design
...
Admin design
2017-09-25 17:23:17 +02:00
