Mrkartoshka 5596bd9f61 Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons ...

 Conflicts:

	ui-ngx/package-lock.json

	ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts

	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts

	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts

	ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts

	ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts

2020-08-11 12:04:34 +03:00

..

providers

Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons

2020-08-11 12:04:34 +03:00

leaflet-map.ts

Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons

2020-08-11 12:04:34 +03:00

map-models.ts

Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons

2020-08-11 12:04:34 +03:00

map-widget2.ts

Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons

2020-08-11 12:04:34 +03:00

map-widget.interface.ts

Map/3.0 (#2738)

2020-05-07 12:25:43 +03:00

maps-utils.ts

Fix calculation value in function for map widget

2020-08-10 16:09:38 +03:00

markers.scss

Editable Polygons without proper typings

2020-08-10 22:52:26 +03:00

markers.ts

Map widgets fixes

2020-08-10 20:05:11 +03:00

polygon.ts

Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons

2020-08-11 12:04:34 +03:00

polyline.ts

Fix calculation value in function for map widget

2020-08-10 16:09:38 +03:00

schemes.ts

Fixed types

2020-08-11 11:37:43 +03:00