Andrew Shvayka
|
dadaa524df
|
Merge pull request #6804 from thingsboard/fix_bug_additinalinfo
[3.4] fix bug: additionalInfo Asset, Alarm, Customer
|
2022-06-27 17:22:03 +03:00 |
|
Andrii Shvaika
|
3e962e151f
|
Improved Redis Serialization
|
2022-06-27 17:12:09 +03:00 |
|
Andrii Shvaika
|
24e856516f
|
Fix integration test
|
2022-06-27 12:33:02 +03:00 |
|
Andrii Shvaika
|
48c3ce7047
|
Fix cache value serialization issue
|
2022-06-27 11:48:58 +03:00 |
|
Andrii Shvaika
|
3e7086cc6f
|
Merge remote-tracking branch 'origin/develop/3.4' into develop/3.4
|
2022-06-27 10:36:03 +03:00 |
|
Andrii Shvaika
|
e9c9e24e2f
|
Improvements to the chunks processing
|
2022-06-27 10:35:50 +03:00 |
|
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 |
|
Andrii Shvaika
|
a107c1ac44
|
Merge branch 'vc-queue-msg-chunking' of github.com:ViacheslavKlimov/thingsboard into develop/3.4
|
2022-06-24 14:56:47 +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 |
|
nickAS21
|
86078005cb
|
Merge branch 'develop/3.4' into fix_bug_additinalinfo
|
2022-06-24 10:13:10 +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 |
|
nickAS21
|
d80452ef40
|
fix bug: EntityView, otaPackage
|
2022-06-23 15:13:25 +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
|
7b8d39f661
|
Undo e.setExternalId(null) in cleanupForComparison
|
2022-06-23 12:42:03 +03:00 |
|
nickAS21
|
3d3d29e905
|
fix bug: additionalInfo Asset, Alarm, Customer
|
2022-06-23 12:21:11 +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 |
|
Viacheslav Klimov
|
d6b516e708
|
VC queue message chunking
|
2022-06-22 18:06:50 +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 |
|