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

10817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nickAS21
ecac67da1c Merge branch 'fix_bug_additinalinfo' into refactoring_tests_08 2022-06-23 18:48:22 +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
Sergey Matvienko
8a9ce8d272 docker-compose: cleanup zookeeper dependency from hybrid. The necessary dependency in the main docker-compose.yml along with zookeeper service 2022-06-23 15:56:47 +03:00
Andrew Shvayka
a6447628ea
Merge pull request #6812 from smatvienko-tb/docker-compose-zookeeper-upgrade-3.8.0 
[3.4] docker-compose: fixed tb-vc-executor for queue-aws-sqs
 2022-06-23 15:56:02 +03:00
Andrew Shvayka
d202034f87
Merge pull request #6809 from vvlladd28/bug/js-executor/incorrect-error 
[3.4] JS-executor: Fixed incorrect parse error code for message
 2022-06-23 15:49:24 +03:00
Sergey Matvienko
56e068fe07 docker-compose: fixed tb-vc-executor for queue-aws-sqs 2022-06-23 15:47:22 +03:00
Andrew Shvayka
6f553867b0
Merge pull request #6805 from ArtemDzhereleiko/AD/tenant-profile-queue-layout 
[3.4] UI: Layout for tenant profile and queue
 2022-06-23 15:47:15 +03:00
Andrew Shvayka
71ed6abee8
Merge pull request #6803 from ViacheslavKlimov/vc-fixes 
[WIP] [3.4] Version control fixes
 2022-06-23 15:44:36 +03:00
Andrew Shvayka
3155a2c02f
Merge branch 'develop/3.4' into vc-fixes 2022-06-23 15:44:09 +03:00
Andrew Shvayka
4b39112a24
Merge pull request #6811 from smatvienko-tb/docker-compose-zookeeper-upgrade-3.8.0 
[3.4] Docker compose bump zookeeper version up to 3.8.0
 2022-06-23 15:41:15 +03:00
Andrii Shvaika
dd2d1e6443 Removed redundant variable 2022-06-23 15:38:31 +03:00
Andrii Shvaika
8dc9297c5f Merge branch 'aggregationTsDao_fix' of github.com:van-vanich/thingsboard into develop/3.4 2022-06-23 15:37:11 +03:00
nickAS21
d80452ef40 fix bug: EntityView, otaPackage 2022-06-23 15:13:25 +03:00
Sergey Matvienko
46682b8bb6 docker-compose: cleanup depends_on for external services 2022-06-23 15:05:41 +03:00
Sergey Matvienko
99de983635 docker-compose: bump zookeeper version from 3.5 up to 3.8.0, disable new admin feature (ZOO_ADMINSERVER_ENABLED=false) 2022-06-23 15:04:03 +03:00
Igor Kulikov
91822ad531 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-23 14:19:56 +03:00
Igor Kulikov
c82c6adb26 Fix conflicts 2022-06-23 14:19:44 +03:00
Andrew Shvayka
5fb462eea6
Merge pull request #6793 from smatvienko-tb/msa-black-box-tests-redis-cluster 
[3.4] msa black box tests: redis-cluster test implemented …
 2022-06-23 14:18:15 +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
Vladyslav_Prykhodko
352abb3f60 JS-executor: Fixed incorrect parse error code for message 2022-06-23 13:52:27 +03:00
van-vanich
4f8806dd8b fix tests in nosql 2022-06-23 13:47:28 +03:00
fe-dev
39064c0217 UI: refactoring 2022-06-23 13:15:06 +03:00
Sergey Matvienko
59b04e6b56 REDISCLI_AUTH password 2022-06-23 12:42:17 +03:00
Viacheslav Klimov
7b8d39f661 Undo e.setExternalId(null) in cleanupForComparison 2022-06-23 12:42:03 +03:00
Sergey Matvienko
d903d0ddc0 default Redis cluster password changed, set REDISCLI_AUTH to simplify redis-cli usage with docker exec 2022-06-23 12:39:50 +03:00
fe-dev
d1995bc27e UI: Layout for tenant profile and queue 2022-06-23 12:22:09 +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
Andrew Shvayka
d87c744778
Merge pull request #6684 from volodymyr-babak/bug/fix-active-flag-on-cloud 
[3.4] Report device activity from edge service - set active flag to true on cloud
 2022-06-23 11:59:30 +03:00
Sergey Matvienko
7b88a437dc docker-compose shell scripts: added CACHE=redis or CACHE=redis-cluster option. Default is redis, README.md updated 2022-06-22 23:24:05 +03:00
van-vanich
7d7701723c improve logic 2022-06-22 23:09:58 +03:00
Sergey Matvienko
d7c750f64e msa black box tests: redis, postgres, node volumes refactored - volumes decoupled to separate files .volumes (used only for tests) 2022-06-22 21:30:34 +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
Sergey Matvienko
40823dd2c0 msa black box tests: redis-cluster test implemented with mvn -DblackBoxTests.redisCluster=true 2022-06-22 17:40:37 +03:00
ivankozka
475fa7e9f5 fix mapping api endpoints in swagger 2022-06-22 17:39:30 +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
van-vanich
f377329fe9 Merge remote-tracking branch 'ce/develop/3.4' into aggregationTsDao_fix 2022-06-22 17:03:46 +03:00