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

4088 Commits

Author SHA1 Message Date
Andrew Shvayka
160cd07053
Merge pull request #6814 from ViacheslavKlimov/vc-fixes 
[3.4] Version control fixes
 2022-06-27 10:27:28 +03:00
Viacheslav Klimov
850aed8b82 Add Swagger api params description for EntitiesVersionControlController 2022-06-24 17:12:57 +03:00
Viacheslav Klimov
8dc799709c Fix entity relations import 2022-06-24 17:01:27 +03:00
Andrew Shvayka
2c17de997c
Merge pull request #6603 from YuriyLytvynchuk/feature/refactor-coap-tests-spead-up 
[3.4] Refactor coap tests spead up
 2022-06-24 14:49:15 +03:00
Viacheslav Klimov
77e7cb9d81 Fix event for deleted relations on import 2022-06-24 13:57:06 +03:00
Viacheslav Klimov
0e2cbd03aa Merge branch 'develop/3.4' into vc-fixes 2022-06-24 13:15:06 +03:00
Viacheslav Klimov
60deed2a73 Use TbNotificationEntityService in VC services 2022-06-24 13:14:51 +03:00
Andrii Shvaika
13765a4dfc Reduced redundant logging 2022-06-24 11:42:23 +03:00
Viacheslav Klimov
9484d62a93 Fix comparing of dashboard to existing one on import 2022-06-23 18:34:38 +03:00
Viacheslav Klimov
9cd101fd67 Not update defaultQueueId of device profile on import 2022-06-23 17:28:26 +03:00
Andrii Shvaika
db5b1467fd Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-23 17:27:18 +03:00
Andrii Shvaika
36fae79179 Fix cluster issues 2022-06-23 17:27:12 +03:00
Viacheslav Klimov
e9f086dd4e Always update widgets on import 2022-06-23 17:00:55 +03:00
Viacheslav Klimov
bcdfab68ea Merge branch 'develop/3.4' into vc-fixes 2022-06-23 16:32:50 +03:00
Viacheslav Klimov
64a82991b5 Fix rule chain comparing on import 2022-06-23 16:24:09 +03:00
Andrew Shvayka
3155a2c02f
Merge branch 'develop/3.4' into vc-fixes 2022-06-23 15:44:09 +03:00
Igor Kulikov
c82c6adb26 Fix conflicts 2022-06-23 14:19:44 +03:00
Igor Kulikov
472357109d VC: Detect default remote branch. Fix Entities Version Control REST API mappings to handle branch parameter. 2022-06-23 14:12:03 +03:00
Viacheslav Klimov
db43c39c54 Fix device version load 2022-06-23 12:12:20 +03:00
Viacheslav Klimov
37d6cd915e Always add default branch to listBranches response 2022-06-23 12:12:15 +03:00
Andrew Shvayka
1be3547c2c
Merge pull request #6790 from ViacheslavKlimov/vc-swagger-docs 
Version control Swagger docs
 2022-06-23 12:03:06 +03:00
Volodymyr Babak
08966675c4 Introduced new counter for device activities 2022-06-22 19:54:10 +03:00
Volodymyr Babak
e068faf6f9 Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud 2022-06-22 19:43:17 +03:00
Volodymyr Babak
731fb1eae8 Code review changes: avoid creating device actor if not needed 2022-06-22 19:42:00 +03:00
Andrii Shvaika
7c69b7c080 Merge PR #6785 2022-06-22 18:44:38 +03:00
Andrii Shvaika
7bad2782ea Merge branch 'entity-view-optimization-develop34-clean' of github.com:smatvienko-tb/thingsboard into develop/3.4 2022-06-22 17:35:22 +03:00
Andrii Shvaika
9801120384 Fixed tests 2022-06-22 17:07:14 +03:00
Volodymyr Babak
5a51028577 Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud 2022-06-22 15:59:00 +03:00
Volodymyr Babak
a3944c5047 Introduced new proto for device activity 2022-06-22 15:56:50 +03:00
Viacheslav Klimov
e551c53b49 Swagger docs for EntitiesVersionControlController 2022-06-22 14:38:02 +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
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
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
Sergey Matvienko
60348d91d5 DefaultTelemetrySubscriptionService - @Lazy TbEntityViewService 2022-06-22 08:51:25 +03:00
Sergey Matvienko
380e994951 TbEntityViewService bean lifecycle after removing TbCoreComponent annotation 2022-06-22 08:51:13 +03:00
Sergey Matvienko
1ee35c2ed4 EntityViewService optimization using local cache and lifecycle event broadcasting 2022-06-22 08:51:05 +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