dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thingsboard/thingsboard into trip-select

Browse Source
This commit is contained in:
Artem Halushko 2020-05-19 15:04:48 +03:00
commit 041ef624a2
3 changed files with 345 additions and 1332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
View File

File diff suppressed because one or more lines are too long

1603
ui-ngx/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

54
ui-ngx/package.json
View File

@ -13,17 +13,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.1.4",
"@angular/cdk": "^9.2.2",
"@angular/common": "^9.1.4",
"@angular/compiler": "^9.1.4",
"@angular/core": "^9.1.4",
"@angular/flex-layout": "^9.0.0-beta.29",
"@angular/forms": "^9.1.4",
"@angular/material": "^9.2.2",
"@angular/platform-browser": "^9.1.4",
"@angular/platform-browser-dynamic": "^9.1.4",
"@angular/router": "^9.1.4",
"@angular/animations": "^9.1.7",
"@angular/cdk": "^9.2.4",
"@angular/common": "^9.1.7",
"@angular/compiler": "^9.1.7",
"@angular/core": "^9.1.7",
"@angular/flex-layout": "^9.0.0-beta.31",
"@angular/forms": "^9.1.7",
"@angular/material": "^9.2.4",
"@angular/platform-browser": "^9.1.7",
"@angular/platform-browser-dynamic": "^9.1.7",
"@angular/router": "^9.1.7",
"@auth0/angular-jwt": "^4.0.0",
"@date-io/date-fns": "^2.6.1",
"@flowjs/flow.js": "^2.14.0",
@ -33,9 +33,9 @@
"@material-ui/core": "^4.9.13",
"@material-ui/icons": "^4.9.1",
"@material-ui/pickers": "^3.2.10",
"@ngrx/effects": "^9.1.0",
"@ngrx/store": "^9.1.0",
"@ngrx/store-devtools": "^9.1.0",
"@ngrx/effects": "^9.1.2",
"@ngrx/store": "^9.1.2",
"@ngrx/store-devtools": "^9.1.2",
"@ngx-share/core": "^7.1.4",
"@ngx-translate/core": "^12.1.2",
"@ngx-translate/http-loader": "^4.0.0",
@ -51,7 +51,7 @@
"flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
"font-awesome": "^4.7.0",
"jquery": "^3.5.1",
"jquery.terminal": "^2.15.4",
"jquery.terminal": "^2.16.0",
"js-beautify": "^1.11.0",
"json-schema-defaults": "^0.4.0",
"jstree": "^3.3.9",
@ -59,13 +59,13 @@
"jszip": "^3.4.0",
"leaflet": "^1.6.0",
"leaflet-polylinedecorator": "^1.6.0",
"leaflet-providers": "^1.9.1",
"leaflet-providers": "^1.10.1",
"leaflet.gridlayer.googlemutant": "0.8.0",
"leaflet.markercluster": "^1.4.1",
"material-design-icons": "^3.0.1",
"messageformat": "^2.3.0",
"moment": "^2.24.0",
"ngx-clipboard": "^13.0.0",
"ngx-clipboard": "^13.0.1",
"ngx-color-picker": "^9.1.0",
"ngx-daterangepicker-material": "^3.0.1",
"ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master",
@ -94,25 +94,25 @@
},
"devDependencies": {
"@angular-builders/custom-webpack": "^9.1.0",
"@angular-devkit/build-angular": "^0.901.4",
"@angular/cli": "^9.1.4",
"@angular/compiler-cli": "^9.1.4",
"@angular/language-service": "^9.1.4",
"@angular-devkit/build-angular": "^0.901.6",
"@angular/cli": "^9.1.6",
"@angular/compiler-cli": "^9.1.7",
"@angular/language-service": "^9.1.7",
"@types/canvas-gauges": "^2.1.2",
"@types/flot": "^0.0.31",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "^2.0.8",
"@types/jquery": "^3.3.38",
"@types/js-beautify": "^1.8.2",
"@types/jstree": "^3.3.39",
"@types/jszip": "^3.1.7",
"@types/jstree": "^3.3.40",
"@types/jszip": "^3.4.1",
"@types/leaflet": "^1.5.12",
"@types/leaflet-markercluster": "^1.0.3",
"@types/leaflet-polylinedecorator": "^1.6.0",
"@types/lodash": "^4.14.150",
"@types/lodash": "^4.14.151",
"@types/raphael": "^2.3.0",
"@types/react": "^16.9.34",
"@types/react-dom": "^16.9.6",
"@types/react": "^16.9.35",
"@types/react-dom": "^16.9.7",
"@types/tinycolor2": "^1.4.2",
"@types/tooltipster": "^0.0.29",
"codelyzer": "^5.2.2",
@ -124,7 +124,7 @@
"karma-chrome-launcher": "^3.1.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "^3.1.1",
"karma-jasmine-html-reporter": "^1.5.3",
"karma-jasmine-html-reporter": "^1.5.4",
"ngrx-store-freeze": "^0.2.4",
"protractor": "^5.4.4",
"ts-node": "^8.9.0",