Viacheslav Klimov 3c1682f57a Merge branch 'master' into master-to-snmp ...

# Conflicts:
#	common/data/pom.xml
#	common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
#	ui-ngx/src/app/shared/models/device.models.ts

2021-04-20 18:08:10 +03:00

..

e2e

Update license header - set 2021 year

2021-01-11 13:42:16 +02:00

src

Merge branch 'master' into master-to-snmp

2021-04-20 18:08:10 +03:00

.editorconfig

Update license header - set 2021 year

2021-01-11 13:42:16 +02:00

.gitignore

ThingsBoard UI - Angular 8 - Initial structure.

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

angular.json

Merge master in develop/3.3

2021-01-27 13:31:46 +02:00

extra-webpack.config.js

Update license header - set 2021 year

2021-01-11 13:42:16 +02:00

LICENSE

Update license

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

package.json

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00

pom.xml

Version set to 3.3.0-SNAPSHOT

2021-04-09 12:37:08 +03:00

proxy.conf.js

Merge pull request #3939 from Dmitriymush/fix/docker_haproxy

2021-01-14 10:24:06 +02:00

tsconfig.json

UI optimizations

2021-01-05 11:37:05 +02:00

tslint.json

Upgrade angular to 10

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

yarn.lock

Introduce entities count datasource.

2021-03-02 12:04:45 +02:00