Commit 01864373 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

parents 31abcbf1 9bf891a2

package.json

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
    "leaflet-minimap": "^3.6.1",

    "leaflet-navbar": "https://github.com/davidchouse/Leaflet.NavBar.git#master",

    "leaflet.coordinates": "^0.1.5",

    "leaflet.wms": "https://github.com/heigeo/leaflet.wms.git#gh-pages",

    "leaflet.nontiledlayer": "^1.0.9",

    "load-grunt-tasks": "^4.0.0",

    "mediator-js": "^0.11.0",

    "moment": "^2.22.1",

public/javascript/dojoConfig.js

+3 −3
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ dojoConfig = { 
		name: 'json-schema-ref-parser',

		location: '../json-schema-ref-parser/dist'

	},{

		name: 'leaflet-wms',

		location: '../leaflet-wms/dist'

		name: 'leaflet.nontiledlayer',

		location: '../leaflet.nontiledlayer/dist'

	},{

		name: 'wicket',

		location: '../wicket'
@@ -119,7 +119,7 @@ dojoConfig = { 
		'd3Tip/index': {

			'd3': 'd3/d3.min'

		},

		'leaflet-wms/leaflet.wms': {

		'leaflet.nontiledlayer/NonTiledLayer': {

			'leaflet': 'leaflet/leaflet'

		},

		'L-miniMap/Control.MiniMap.min': {

public/javascript/dojoConfigBuild.js

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ dojoConfig = { 
		'd3Tip/index': {

			'd3': 'd3/d3.min'

		},

		'leaflet-wms/leaflet.wms': {

		'leaflet.nontiledlayer/NonTiledLayer': {

			'leaflet': 'leaflet/leaflet'

		},

		'L-miniMap/Control.MiniMap.min': {

public/javascript/leaflet-wms

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../node_modules/leaflet.wms
 
 No newline at end of file

public/javascript/leaflet.nontiledlayer

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../node_modules/leaflet.nontiledlayer
 
 No newline at end of file