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

4044 Commits

Author SHA1 Message Date
Andrii Shvaika
9801120384 Fixed tests 2022-06-22 17:07:14 +03:00
Andrew Shvayka
774bb96853
Merge pull request #6734 from thingsboard/refactoring_test_customer_05 
[3.4] Refactoring test customer
 2022-06-22 13:32:41 +03:00
nickAS21
f8609ef329 reole conflicts2 2022-06-22 13:09:20 +03:00
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
nickAS21
5ee6009078 Merge branch 'develop/3.4' into refactoring_test_customer_05 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
 2022-06-22 12:42:26 +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
nickAS21
439fe05a7e Merge branch 'develop/3.4' into refactoring_test_customer_05 
# Conflicts:
#	common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
 2022-06-22 11:43:01 +03:00
nickAS21
dbd509ed0c refactoring: tests change change name method2 2022-06-22 11:09:55 +03:00
Andrii Shvaika
02f61cea79 Merge PR #5924 2022-06-22 11:03:32 +03:00
nickAS21
f4befe9ce1 refactoring: tests change change name method 2022-06-22 10:38:16 +03:00
nickAS21
1f945a695b refactoring: tests extract line 2022-06-22 07:08:24 +03:00
nickAS21
f7fcc9a7b0 refactoring: tests error add change to matcher 2022-06-22 06:58:55 +03:00
nickAS21
34d6b7a035 Merge branch 'develop/3.4' into refactoring_test_customer_05 2022-06-21 19:09:23 +03:00
nickAS21
5d06929c73 refactoring: tests asset 2022-06-21 18:59:18 +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
nickAS21
9e1cb8593f Merge branch 'develop/3.4' into refactoring_test_customer_05 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
 2022-06-21 08:05:28 +03: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
nickAS21
6cf8f51d6b Merge remote-tracking branch 'origin/fix_bug_controller_alarm_asset' into refactoring_test_customer_05 2022-06-18 21:19:39 +03:00
Andrii Shvaika
5cad77910f Improved method that replaces uuids 2022-06-18 10:48:02 +03:00
nickAS21
f57578c87a update license header 2022-06-18 10:18:58 +03:00
Andrii Shvaika
7a4fec93cd Fix re-import of rule chains, and different not related test 2022-06-18 09:28:54 +03:00
nickAS21
87e28c9fc8 refactoring: removed extra line 2022-06-17 19:54:27 +03:00
nickAS21
cdaacb4ed0 refactoring: add Mockito.reset(tbClusterService, auditLogService) 2022-06-17 19:15:03 +03:00
nickAS21
f2695138ff refactoring: add method manyTime 2022-06-17 18:36:29 +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
nickAS21
ed5696c3f9 refactoring: fix bug asset.save alarm.delete 2022-06-17 16:01:40 +03:00
Igor Kulikov
4ca32aab0a Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-17 14:58:41 +03:00