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

10557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sergey Matvienko
59b04e6b56 REDISCLI_AUTH password 2022-06-23 12:42:17 +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
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
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
Sergey Matvienko
40823dd2c0 msa black box tests: redis-cluster test implemented with mvn -DblackBoxTests.redisCluster=true 2022-06-22 17:40:37 +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
Andrii Shvaika
5e65438ebb Add EdgeService to the WidgetContext 2022-06-22 16:51:40 +03:00
Andrii Shvaika
4b087cdcbd Merge with master 2022-06-22 16:48:06 +03:00
Andrii Shvaika
2aee04812e Bump Kafka broker version to 3.2.0 2022-06-22 16:36:13 +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
Andrii Shvaika
eb1f280a5a Merge branch 'kafka-client-3-2-0' of github.com:smatvienko-tb/thingsboard into develop/3.4 2022-06-22 15:34:26 +03:00
Igor Kulikov
8288eade74
Merge pull request #6788 from devaskim/latest_value_in_legend 
[3.4] UI: Add option to show latest value in widget's legend.
 2022-06-22 15:26:22 +03:00
Viacheslav Klimov
e551c53b49 Swagger docs for EntitiesVersionControlController 2022-06-22 14:38:02 +03:00
Andrew Shvayka
0c7dd1ec23
Merge pull request #6784 from smatvienko-tb/docker-optimization-no-install-recommend 
[3.4] Dockerfile optimization: --no-install-recommends
 2022-06-22 14:10:15 +03:00
Andrew Shvayka
3ab01ba1ba
Merge pull request #6782 from smatvienko-tb/js-executor-kafka-producer-partitioner 
[3.4] js-executor: kafkaClient.producer({ createPartitioner: Partitioners.DefaultPartitioner })
 2022-06-22 13:50:38 +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
Andrew Shvayka
db2c5dc4c5
Merge pull request #6669 from ViacheslavKlimov/fix/copy-attributes-to-view 
[3.4] Fix NPE in 'copy to view' node
 2022-06-22 13:24:51 +03:00
nickAS21
f8609ef329 reole conflicts2 2022-06-22 13:09:20 +03:00
Andrew Shvayka
0a02227646
Merge pull request #6665 from smatvienko-tb/compression-type-transports 
[3.4] Compression type added for transports yaml
 2022-06-22 13:09:10 +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
devaskim
1d08e319bc Add latest value to widget's legend. 2022-06-22 14:53:43 +05: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
Andrii Shvaika
c744192d37 Merge PR #6262 2022-06-22 11:29:44 +03:00
Andrii Shvaika
6f78d8245a Merge branch 'restApiCallNodeJsonVarFix' of github.com:desoliture1/thingsboard into develop/3.4 2022-06-22 11:23:28 +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
Andrii Shvaika
923dcff8e5 No more transaction cache 2022-06-22 10:31:32 +03:00