Commit 707faf7e authored by Niels Holt's avatar Niels Holt

Merge branch '5.6.0'

parents a7038dc0 dc7e0d33
......@@ -39,6 +39,12 @@
"date": "2019-03-22",
"url": "data/ifm-maps-v5.5.0.md",
"title": {"da":"Ny version af Sejladsudsigt (v5.5.0)", "en":"New version of Marine Forecast (v5.5.0)"}
},
{
"id": "5_6_0",
"date": "2019-04-09",
"url": "data/ifm-maps-v5.6.0.md",
"title": {"da":"Ny version af Sejladsudsigt (v5.6.0)", "en":"New version of Marine Forecast (v5.6.0)"}
}
......
<da>
Vi arbejder løbende på at forbedre Sejladsudsigt.
Denne version indeholder mindre fejlrettelser og opdateringer
</da>
<en>
We are continuing improving Marine Forecast.
This version contains minor error corrections and updates
</en>
{
"name": "ifm-maps",
"version": "5.5.1",
"version": "5.6.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Brian Sørensen brs@fcoo.dk",
......@@ -12,8 +12,8 @@
"url": "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^5.7.0",
"fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#^5.1.0",
"fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^6.0.0",
"fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#^6.0.0",
"jquery-ui": "^1.12.1",
"leaflet-control-position": "fcoo/leaflet-control-position#^0.2.5",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers#^2.0.0",
......@@ -22,13 +22,10 @@
"leaflet-control-vertical": "fcoo/leaflet-control-vertical#^2.0.0",
"leaflet-control-datetime": "fcoo/leaflet-control-datetime#^1.0.0",
"leaflet-tilelayer-wms-pydap": "https://gitlab.com/fcoo/leaflet-tilelayer-wms-pydap.git#^4.0.0",
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#^1.0.0",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#^1.0.0",
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#^2.0.0",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#^2.0.0",
"babel-polyfill": "^0.0.1"
},
"YTresolutions": {
"leaflet-bootstrap": "~2.1.1"
},
"overrides": {
"jquery-ui": {
"main": [
......@@ -42,70 +39,6 @@
},
"leaflet-control-osm-geocoder": {
"main": "Control.OSMGeocoder.js"
},
"offline": {
"main": [
"offline.js"
]
},
"url.js": {
"main": [
"src/url.min.js"
]
},
"bootstrap-select": {
"main": [
"dist/js/bootstrap-select.js"
]
},
"jquery.scrollbar": {
"main": [
"jquery.scrollbar.js"
]
},
"bootstrap": {
"dependencies": {
"jquery": "latest"
},
"main": [
"dist/js/bootstrap.bundle.js"
]
},
"inputmask": {
"main": [
"dist/jquery.inputmask.bundle.js"
]
},
"moment": {
"main": [
"moment.js",
"locale/da.js",
"locale/de.js",
"locale/sv.js",
"locale/nb.js",
"locale/fo.js"
]
},
"leaflet": {
"dependencies": {
"fcoo-global-switches": "latest"
}
},
"leaflet.locatecontrol": {
"main": [
"src/L.Control.Locate.js"
]
},
"Leaflet.GeometryUtil": {
"main": "src/leaflet.geometryutil.js",
"dependencies": {
"leaflet": "latest"
}
},
"Leaflet.Geodesic": {
"dependencies": {
"leaflet": "latest"
}
}
},
"devDependencies": {
......@@ -123,10 +56,5 @@
],
"moduleType": [
"es6"
],
"resolutions": {
"url.js": "2.4.0",
"bootstrap": "^4.0.0",
"i18next-phrases": "^2.0.0"
}
]
}
\ No newline at end of file
{
"name": "ifm-maps",
"version": "5.5.1",
"version": "5.6.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment