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
depfu[bot]
2fde9ec1b8
Upgrade byebug to version 9.1.0
2017-09-29 12:00:16 +00:00
Pedro Ríos Flores
323b05f4de
Issue #1901 : Budget related entries in Management shouldn't appear if budgets are globally disabled.
2017-09-29 12:30:02 +02:00
Pedro
178f97f73b
Merge pull request #1 from consul/master
...
Merge 29/09/17
2017-09-29 12:06:21 +02:00
Bertocq
07592f6b0d
Correct Poll current/expired/incoming scopes and helper functions
2017-09-29 11:50:23 +02:00
Raimond Garcia
583fb65c79
Merge pull request #1937 from consul/depfu/update/nokogiri-1.8.1
...
🚨 [security] Update nokogiri to version 1.8.1
2017-09-29 11:47:55 +02:00
decabeza
1a0467d2c6
adds data equalizer watch to prevent js errors
2017-09-29 09:23:05 +02:00
decabeza
f44f3f5bc1
fixes css to shows error messages correctly
2017-09-28 17:52:28 +02:00
María Checa
14fe771fa5
Fixed wrong officer action path
...
Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct.
2017-09-28 17:47:50 +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
María Checa
1e0aec37ab
Removed link to poll question in the web in admin section
2017-09-28 17:37:31 +02:00
Alessandro Cuoghi
20fd176b6a
Change again margin-top to button.hollow
2017-09-28 17:13:45 +02:00
Alessandro Cuoghi
4eee5f6eba
Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded.
2017-09-28 17:03:50 +02:00
depfu[bot]
9a6e3219c9
Update nokogiri to version 1.8.1
2017-09-28 14:14:06 +00:00
decabeza
876a2b530b
fixes lint warnings
2017-09-28 16:03:08 +02:00
decabeza
fd78eb30cc
shows hr tag on forms only when expanded
2017-09-28 15:20:47 +02:00
decabeza
8aaa0cb718
adds data equalizer to fix height on items with images
2017-09-28 15:20:00 +02:00
Senén Rodero Rodríguez
92c774cdeb
Merge with master
2017-09-28 13:36:20 +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
decabeza
fff643db8c
improves delete image button on proposal show
2017-09-28 09:16:08 +02:00
decabeza
33d9d2d005
adds new icon image
2017-09-28 09:15:46 +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
