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 |
|
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 |
|