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 |
|
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 |
|