dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,395 Commits 106 Branches 71 Tags
Commit Graph

10395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Matvienko
cffd0a3a1e QueueKey toString for better logging experience 2022-06-21 18:12:29 +03:00
Andrii Shvaika
d53985c073 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-21 16:11:53 +03:00
Andrii Shvaika
ebbf583392 Fix multi-key cache transaction for attributes service 2022-06-21 16:11:39 +03:00
Andrew Shvayka
a160c542b8
Merge pull request #5959 from desoliture1/tenantExistsRefactor 
[3.4] Add cacheable tenantExists method and refactor usages in validators
 2022-06-21 15:13:35 +03:00
YevhenBondarenko
c40823095e checkRelation improvements 2022-06-21 10:32:26 +02:00
Sergey Matvienko
0141787d08 RedisTbTransactionalCache - redis cluster watch support by a single key 2022-06-21 11:22:07 +03:00
YevhenBondarenko
697f317e4b merget with develop/3.4 2022-06-21 07:18:11 +02:00
Andrew Shvayka
9a77fb8abd
Merge pull request #6759 from thingsboard/feature/entities-version-control 
[3.4] Entities version control
 2022-06-20 17:15:34 +03:00
Andrii Shvaika
4ba19dea89 Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-20 17:09:32 +03:00
Andrii Shvaika
8fa5fc8c3f Improved rate limits processing filter to avoid NPE 2022-06-20 17:09:05 +03:00
Igor Kulikov
6bf6893b30 Revert get entity alarms controller method 2022-06-20 16:53:06 +03:00
Andrew Shvayka
72944d8a1f
Merge pull request #6736 from ViacheslavKlimov/vc-improvements 
VC tests refactoring
 2022-06-20 16:01:40 +03:00
Andrii Shvaika
bdd8432049 Fix import/export of rule chains and dashboard with external id references 2022-06-20 12:00:21 +03:00
Andrii Shvaika
5cad77910f Improved method that replaces uuids 2022-06-18 10:48:02 +03:00
Andrii Shvaika
7a4fec93cd Fix re-import of rule chains, and different not related test 2022-06-18 09:28:54 +03:00
Andrii Shvaika
3d85fb7c0a Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-17 16:10:55 +03:00
Andrii Shvaika
fa5335130b Entities import/export for CE 2022-06-17 16:10:29 +03:00
Igor Kulikov
4ca32aab0a Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-17 14:58:41 +03:00
Igor Kulikov
d33c783b66 Fix circular bean dependency 2022-06-17 14:57:37 +03:00
Igor Kulikov
1e75f9f0e3 Merge with develop/3.4 2022-06-17 13:59:32 +03:00
Igor Kulikov
4036725d10 Fix entities deletion order when deleting tenant 2022-06-17 13:55:03 +03:00
Igor Kulikov
48a9907add Merge branch 'ViacheslavKlimov-rate-limits-to-tenant-profile' into develop/3.4 2022-06-17 13:04:43 +03:00
Igor Kulikov
d982c09f68 Fix conflicts 2022-06-17 13:04:32 +03:00
Igor Kulikov
401e798b58 Fix getAlarms for entity for customer - filter by customer id. 2022-06-17 12:46:31 +03:00
Viacheslav Klimov
f9bfe6eb6f Fix 2fa error msg 2022-06-17 12:10:02 +03:00
Viacheslav Klimov
1d8a2a0885 Fix testExternalIdsInExportData 2022-06-17 12:06:51 +03:00
Andrii Shvaika
8099c19eb7 Merge #6730 2022-06-17 11:56:54 +03:00
Andrii Shvaika
2dad98b2f7 Improvement to the Rule Chain diff 2022-06-17 11:54:20 +03:00
Viacheslav Klimov
86c5d18116 Tests for external ids in export data 2022-06-17 11:37:28 +03:00
YevhenBondarenko
2b18b44a52 added tenant cache 2022-06-16 22:04:26 +02:00
Viacheslav Klimov
49a83d3e18 Fix tests 2022-06-16 18:17:12 +03:00
Andrii Shvaika
493b8f2f7b Improved comparison of the objects before import 2022-06-16 17:53:05 +03:00
Igor Kulikov
dc8798e0c2 Update vc-executor docker build script 2022-06-16 15:21:45 +03:00
Igor Kulikov
9168669b4b Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-16 15:19:06 +03:00
Andrii Shvaika
5c72f596a4 Remove test logging 2022-06-16 15:04:59 +03:00
Andrii Shvaika
ad20b5d866 Fix Ota Package Ids 2022-06-16 15:00:43 +03:00
Igor Kulikov
aadfd1eb88 Dockerfile improvements 2022-06-16 13:47:02 +03:00
YevhenBondarenko
e61bfea55e merge with develop/3.4 2022-06-16 12:04:58 +02:00
Igor Kulikov
4195d48c3b Updated and optimized docker build files. 2022-06-16 12:39:39 +03:00
Viacheslav Klimov
6e27ed46d6 Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
#	application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityImportSettings.java
 2022-06-16 12:36:27 +03:00
Andrii Shvaika
c0e84e2242 Fix license headers 2022-06-16 12:33:06 +03:00
Viacheslav Klimov
3581172e8f Tests for export/import api 2022-06-16 12:32:12 +03:00
Andrii Shvaika
15c1e215d4 Improve performance of relation and rule chain service 2022-06-16 12:09:17 +03:00
Igor Kulikov
7e7f54319c
Merge pull request #6719 from smatvienko-tb/postgres-await-startup 
[3.4] Postgres await startup in docker containers with Postgres bundled
 2022-06-16 12:05:23 +03:00
Igor Kulikov
b91dbdca2a
Merge pull request #6721 from vvlladd28/improvemnt/msa/pkg-script 
[3.4] UI: Updated version node in pkg script
 2022-06-16 12:00:55 +03:00
Igor Kulikov
2062ad3611
Merge pull request #6729 from smatvienko-tb/debian-release-for-postgres-repository 
[3.4] Postgresql repo from os-release $VERSION_CODENAME for dockerfile.
 2022-06-16 11:59:25 +03:00
Igor Kulikov
7d35f3d8ca
Merge pull request #6190 from duhow/optimize-dockerfiles-2 
[3.4] Optimize Dockerfiles
 2022-06-16 11:58:48 +03:00
Viacheslav Klimov
88fcff5556 Set external ids in the config of rule chains and dashboards on export; add JsonIgnoreProperties in export data 2022-06-16 11:10:49 +03:00
Sergey Matvienko
7652576662 Postgresql repo from os-release $VERSION_CODENAME for dockerfile. Disable docker cache temporary to avoid cached releases collission 2022-06-16 11:04:12 +03:00
Andrii Shvaika
2fb13de456 Backport of the permance improvements from PE 2022-06-16 08:47:19 +03:00