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
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
BertoCQ
4e5b80f79f
Merge pull request #1928 from consul/feature/1924#poll_shifts_creation
...
Add Shift tasks
2017-09-28 13:30:45 +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
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
María Checa
08cdf93ecc
Switch date selects for shift tasks
2017-09-28 10:40:48 +02:00
Bertocq
13aa5a3ba8
Increase Admin Shift creation scenarios for both tasks options
2017-09-27 18:47:06 +02:00
BertoCQ
e526d3b883
Merge pull request #1930 from consul/admin-filters
...
Admin filters
2017-09-27 18:17:44 +02:00
Bertocq
f40a0d09ed
Add Shift vote and recount date ranges, filter selected one on controller
2017-09-27 18:08:03 +02:00
decabeza
c8341fc5f1
adds missing translation
2017-09-27 18:08:01 +02:00
decabeza
407c0fc702
fixes styles for filters, orders and subnavs on admin
2017-09-27 17:57:54 +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
c9963b1c4f
Some alignment fixes
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
05350b0f40
Fix scss lint warnings
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5a09b79da4
Move map tiles provider server and map tiles attribution to secrets.
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5113fefef6
Change open street maps tile server url.
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
053a87eb2c
Refactor map locations helper
2017-09-27 14:49:08 +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
3b04f881e7
Fix map marker positioning.
2017-09-27 14:48:12 +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
dd7afd3593
Add methods to map locations helper.
2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
a14bb77f49
Fix map location form fields ids definition.
2017-09-27 14:48:12 +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
Bertocq
1dde4cb3ec
Add types to Poll Shifts as an enum
2017-09-27 13:57:16 +02:00
Raimond Garcia
ea5a7af5fd
Merge pull request #1926 from rockandror/remove-single-uploads
...
Remove single uploads
2017-09-27 13:16:35 +02:00
Senén Rodero Rodríguez
6c1d828a62
Remove unneded code
2017-09-27 11:38:38 +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
Raimond Garcia
45f34540ae
Merge pull request #1915 from rockandror/feature/imageable_concern
...
Feature/imageable concern
2017-09-26 16:17:50 +02:00
Senén Rodero Rodríguez
5deb07328b
Remove obsolete code
2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
2854c0b683
Some fixes and refactor
2017-09-26 13:57:14 +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
f6fba64012
Remove uneeded document and image initializations
2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
e58feb7d6d
Fix for remote filesytem paperclip configuration.
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
eb8ab83ac9
Remove cached files after complete uploads.
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
93e5c9656c
Remove unnedded code
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
0a86727c6a
Move method 'recover_image_from_cache' from imageable controllers to image.
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
c22637c349
Move method 'recover_documents_from_cache' from documentable controllers to document.
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
d98d1312ca
Add _destroy parameter to nested image
2017-09-26 13:57:13 +02:00