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

2389 Commits

Author SHA1 Message Date
Andrew Shvayka
c93772273c
Merge pull request #6642 from ViacheslavKlimov/fix/device-profile-permissions-checks 
[3.4] Fix permission checks for DeviceProfileController
 2022-06-22 13:02:09 +03:00
Andrew Shvayka
4c6f817e05
Merge pull request #6781 from volodymyr-babak/feature/edge-add-ota-updates 
[3.4] Edge OTA support
 2022-06-22 12:47:51 +03:00
Andrew Shvayka
34db923d4d
Merge pull request #6699 from volodymyr-babak/bug/edge-find-missing-related-rulechains 
[3.4] Fix validation of missing rule chain during assignment to the edge is broken.
 2022-06-22 11:57:21 +03:00
Andrew Shvayka
f80583db72
Merge pull request #6600 from volodymyr-babak/feature/edge-converters-integration 
[3.4] Edge integrations/converters support
 2022-06-22 11:45:44 +03:00
Andrii Shvaika
923dcff8e5 No more transaction cache 2022-06-22 10:31:32 +03:00
Andrew Shvayka
a5050cdf7f
Merge pull request #6780 from smatvienko-tb/queue-to-string-useability 
[3.4] QueueKey toString for a better logging experience
 2022-06-21 18:35:31 +03:00
Sergey Matvienko
cffd0a3a1e QueueKey toString for better logging experience 2022-06-21 18:12:29 +03:00
Andrii Shvaika
f5603c4f72 Merge with develop/3.4 2022-06-21 17:57:19 +03:00
Andrii Shvaika
68aa0a2a75 Minor improvements 2022-06-21 17:54:19 +03:00
Volodymyr Babak
2bf8e9d5b4 Add implementation and test for ota package contructor 2022-06-21 17:53:30 +03:00
Andrii Shvaika
a4cd4f3351 Fix vc status api calls 2022-06-21 17:17:13 +03:00
Volodymyr Babak
3b3a41a2ec Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-add-ota-updates 2022-06-21 16:45:23 +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
Volodymyr Babak
68e35bbb40 Merge remote-tracking branch 'upstream/develop/3.4' into feature/edge-converters-integration 2022-06-21 15:47:46 +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
Volodymyr Babak
17ec3f41f4 Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-converters-integration 2022-06-20 22:06:05 +03:00
Andrii Shvaika
2a447ec345 Add Load Entities Progress 2022-06-20 18:05:55 +03:00
Andrii Shvaika
b08b39fb08 Version Control Progress implementation 2022-06-20 17:06:32 +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
Volodymyr Babak
3912aadf72 Added otapackage support for edge - part #1 2022-06-17 18:26:32 +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
1e75f9f0e3 Merge with develop/3.4 2022-06-17 13:59:32 +03:00
Igor Kulikov
d982c09f68 Fix conflicts 2022-06-17 13:04:32 +03:00
Andrii Shvaika
8099c19eb7 Merge #6730 2022-06-17 11:56:54 +03:00
Andrii Shvaika
493b8f2f7b Improved comparison of the objects before import 2022-06-16 17:53:05 +03:00
YevhenBondarenko
e61bfea55e merge with develop/3.4 2022-06-16 12:04:58 +02: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
15c1e215d4 Improve performance of relation and rule chain service 2022-06-16 12:09:17 +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
Andrii Shvaika
2fb13de456 Backport of the permance improvements from PE 2022-06-16 08:47:19 +03:00
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Igor Kulikov
c4bdee92db PSQL annotation and dialect cleanup. 2022-06-15 14:04:13 +03:00
Igor Kulikov
0c1d3611cd
Merge pull request #5983 from amarkevich/PostgreSQL10Dialect 
switch to PostgreSQL10Dialect
 2022-06-15 13:07:23 +03:00
Andrii Shvaika
6579807bb6 Bug fixes and no more tenant id in the git repo 2022-06-15 11:44:23 +03:00
Andrii Shvaika
c63805bcf1 Merge the PR #6713 2022-06-15 10:55:48 +03:00
Viacheslav Klimov
5df2ca5372 Set external ids instead of internal on export 2022-06-14 16:42:33 +03:00
Andrii Shvaika
7c16904c5e Send events after transaction finish 2022-06-14 15:13:27 +03:00
Andrii Shvaika
08dea33afc Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-14 12:28:47 +03:00
Andrii Shvaika
1838e147a6 Batch Relations save for import performance improvement 2022-06-14 12:28:37 +03:00
Igor Kulikov
f25dd50254
Merge pull request #6704 from ViacheslavKlimov/entity-view-ie 
Entity views VC
 2022-06-14 11:07:57 +03:00
Andrii Shvaika
4605d7e56c Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-13 16:21:19 +03:00
Andrii Shvaika
82763495e0 Perofrmance improvements 2022-06-13 16:21:05 +03:00
Volodymyr Babak
2a3126822e Minor code review changes 2022-06-13 13:52:40 +03:00
Viacheslav Klimov
e78a891044 Entity views export/import 2022-06-13 13:47:45 +03:00