vzikratyi 985e0350d8 Merge branch 'master' into feature/dynamic-oauth2-new-table ...

# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

2020-10-08 15:38:13 +03:00

..

e2e

Update angular version

2020-10-08 11:45:50 +03:00

src

Merge branch 'master' into feature/dynamic-oauth2-new-table

2020-10-08 15:38:13 +03:00

.editorconfig

Prepare for merge with master

2020-02-20 10:26:43 +02:00

.gitignore

ThingsBoard UI - Angular 8 - Initial structure.

2019-08-08 19:39:06 +03:00

angular.json

UI: Added device profile schedule setting for alarm setting

2020-10-06 19:22:40 +03:00

extra-webpack.config.js

Update angular version

2020-10-08 11:45:50 +03:00

LICENSE

Update license

2020-03-23 16:29:15 +02:00

package.json

Update angular version

2020-10-08 11:45:50 +03:00

pom.xml

Merge with master

2020-09-14 14:25:08 +03:00

proxy.conf.js

Optimize import modules

2020-08-14 17:29:55 +03:00

tsconfig.json

Update angular version

2020-10-08 11:45:50 +03:00

tslint.json

Upgrade angular to 10

2020-08-13 19:00:48 +03:00

yarn.lock

Update angular version

2020-10-08 11:45:50 +03:00