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

4028 Commits

Author SHA1 Message Date
Volodymyr Babak
a3944c5047 Introduced new proto for device activity 2022-06-22 15:56:50 +03:00
Volodymyr Babak
87834c2ccd Remove unused paramater 2022-06-22 12:52:49 +03:00
Volodymyr Babak
3665cae3f8 Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud 2022-06-22 12:52:03 +03:00
Volodymyr Babak
59bcc2f600 Code review changes 2022-06-22 12:51:55 +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
nickAS21
5f73066602 resolve conflicts 2022-06-22 12:32:53 +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
02f61cea79 Merge PR #5924 2022-06-22 11:03:32 +03:00
Andrew Shvayka
00a031db96
Merge pull request #6712 from desoliture1/swaggerApiTypo 
[3.4] Swagger dashboard api typo fix
 2022-06-21 18:15:04 +03:00
Andrii Shvaika
f5603c4f72 Merge with develop/3.4 2022-06-21 17:57:19 +03:00
Volodymyr Babak
2bf8e9d5b4 Add implementation and test for ota package contructor 2022-06-21 17:53:30 +03:00
Andrew Shvayka
11e43aa68e
Merge pull request #6686 from YevhenBondarenko/fix/vulnerabilities 
[3.4]  fix vulnerabilities
 2022-06-21 17:20:32 +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
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
697f317e4b merget with develop/3.4 2022-06-21 07:18:11 +02:00
Volodymyr Babak
a5f0f1d04c Fixed compilation error 2022-06-20 22:54:18 +03:00
Volodymyr Babak
824129bc62 Fixed compilation error 2022-06-20 22:52:54 +03: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
0cfaf3c6ef Merge branch 'feature/vc-progress' of github.com:thingsboard/thingsboard into feature/vc-progress 2022-06-20 18:06:23 +03:00
Andrii Shvaika
2a447ec345 Add Load Entities Progress 2022-06-20 18:05:55 +03:00
Igor Kulikov
5c240469b2 Merge branch 'develop/3.4' into feature/vc-progress 2022-06-20 17:28:56 +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
Andrii Shvaika
b08b39fb08 Version Control Progress implementation 2022-06-20 17:06:32 +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
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
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
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
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
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
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