Open-source IoT Platform - Device management, data collection, processing and visualization.
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Dmytro Skarzhynets
bee8f370b9
Merge branch 'master' into ai
# Conflicts:
# application/src/main/data/upgrade/basic/schema_update.sql
# application/src/main/java/org/thingsboard/server/controller/BaseController.java
# application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
# application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
# application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
# common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
# common/proto/src/main/proto/queue.proto
# dao/pom.xml
# dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
# dao/src/main/resources/sql/schema-entities.sql
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
|
12 months ago |
| .. |
|
rule-engine-api
|
Merge branch 'master' into ai
|
12 months ago |
|
rule-engine-components
|
Merge branch 'master' into ai
|
12 months ago |
|
pom.xml
|
Version set to 4.2.0-SNAPSHOT
|
1 year ago |
