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

3192 Commits

Author SHA1 Message Date
Swoq
22ce8cf063 Fix upgrade from version 3.2.2 2021-11-04 13:04:06 +02:00
Viacheslav Klimov
fe5215c7cc Minor refactoring 2021-11-04 12:55:23 +02:00
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
Igor Kulikov
cd23b85baa Bump hsqldb version to 2.6.1 to fix sql timeout issues 2021-11-04 11:15:44 +02:00
Igor Kulikov
7f1559f170 Fix swagger redirect 2021-11-03 19:29:56 +02:00
Igor Kulikov
6e2f1ccf57 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 17:12:19 +02:00
Igor Kulikov
2aa7170dba Update swagger properties 2021-11-03 17:12:05 +02:00
Andrew Shvayka
447dcdcad5
Merge pull request #4878 from smatvienko-tb/feature/sql-query-timeout 
Timeout for all SQL queries to survive enormous heavy query
 2021-11-03 16:45:30 +02:00
Andrii Shvaika
b3534942a5 Entity Id and Swagger description 2021-11-03 16:18:00 +02:00
Igor Kulikov
34d6dc50b5 Swagger improvements 2021-11-03 15:03:56 +02:00
Viacheslav Klimov
8d28a28b08 Implement entities search within all tenants 2021-11-01 20:04:35 +02:00
Igor Kulikov
113a6389fa Merge with master 2021-11-01 18:59:09 +02:00
Igor Kulikov
d110f5a005 Update springfox swagger version. 2021-11-01 18:58:11 +02:00
Dima Landiak
c49297b433 logging improvements 2021-11-01 14:57:16 +02:00
Dima Landiak
8914cdb707 fixed the reprocessing logic for rule engine messages when the strategy is not set to reprocess them 2021-11-01 13:23:38 +02:00
Andrii Shvaika
3e67dc1c00 Restore the getTenantAsset API call signature 2021-10-29 15:58:05 +03:00
Andrii Shvaika
03fb9dcd7f Fix UUID link 2021-10-29 15:56:01 +03:00
Andrew Shvayka
3490045f96
Merge pull request #5461 from volodymyr-babak/master 
[3.2.2] Edge Swagger docs - part 2
 2021-10-29 12:17:23 +03:00
Volodymyr Babak
757eef1cfa Fixed constants for edge assing/unassign 2021-10-29 10:50:43 +03:00
Volodymyr Babak
0635929b19 Edge Swagger docs - part 2 2021-10-29 10:18:50 +03:00
Andrew Shvayka
344878b976
Merge pull request #5441 from ShvaykaD/feature/json-payload-for-v1-topics-in-proto-profile 
[3.3.2] MQTT backward compatibility adaptor
 2021-10-28 17:07:03 +03:00
ShvaykaD
ec05751198 fix typo in AbstractMqttAttributesUpdatesJsonIntegrationTest 2021-10-28 13:48:07 +03:00
ShvaykaD
ec8808c920 updated mqtt transport tests 2021-10-28 13:36:03 +03:00
Andrew Shvayka
944b2f7572
Merge pull request #5453 from YevhenBondarenko/lwm2m-improvements 
[3.3.2] process deleting device and updating credential events for LwM2M
 2021-10-27 17:37:33 +03:00
YevhenBondarenko
dda06bd0a1 process update credentials event for lwm2m transport 2021-10-27 17:00:00 +03:00
Igor Kulikov
f4e864608e HTTP/2 configuration support 2021-10-27 16:34:37 +03:00
Igor Kulikov
2eeb6d43b0 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-10-27 14:20:04 +03:00
Igor Kulikov
483a69fed1 Use SSL credentials configuration to setup HTTPS. Enable Lwm2m credentials by default. 2021-10-27 14:19:50 +03:00
Dima Landiak
0745ee3d0a fixed passed topic name for consumer constructor in rule engine queue 2021-10-27 11:26:46 +03:00
Igor Kulikov
a47bb55dd2 Improve PEM certificates processing. Fix lwm2m transport test properties. 2021-10-27 10:10:54 +03:00
Igor Kulikov
78e00265ec Merge branch 'master' of github.com:thingsboard/thingsboard 2021-10-26 19:40:50 +03:00
Igor Kulikov
362ccf9f31 Unified transport SSL credentials 2021-10-26 19:40:38 +03:00
Andrii Shvaika
49394fab0e Optimize imports for controllers 2021-10-26 15:13:58 +03:00
Andrii Shvaika
38a3ca682f Merge branch 'master' of github.com:thingsboard/thingsboard 2021-10-25 17:40:04 +03:00
Andrii Shvaika
d437ec8719 Telemetry controller documentation 2021-10-25 17:28:04 +03:00
Igor Kulikov
461c18c160 Update help base url 2021-10-25 16:09:25 +03:00
Igor Kulikov
641db71ce6 Configure UI help assets base url. 2021-10-25 16:03:14 +03:00
Andrii Shvaika
4ed34e5468 Device Controller 2021-10-25 13:53:37 +03:00
Andrii Shvaika
4443fbcb27 Refactoring of Save Device With Credentials 2021-10-25 11:43:53 +03:00
Andrii Shvaika
05d944e5bd Merge remote-tracking branch 'origin/lwm2m_controller_swagger' 2021-10-25 10:52:56 +03:00
Andrii Shvaika
5aed684bdd Entity View controller 2021-10-25 10:50:28 +03:00
nickAS21
e84fbdf654 Lwm2m controller swagger 2021-10-24 23:15:59 +03:00
Dima Landiak
33c6aeccff additional improvements to the docs of the event controller (event filters) 2021-10-22 11:36:52 +03:00
Andrii Shvaika
fbdb7bf224 Move constants to ControllerConstants 2021-10-21 19:46:24 +03:00
Andrii Shvaika
45424dedeb Merge branch 'feature/swagger-device-profile-data' of https://github.com/dmytro-landiak/thingsboard into feature/swagger 2021-10-21 19:18:27 +03:00
Andrii Shvaika
8c6e257c02 Merge remote-tracking branch 'origin/master' into feature/swagger 2021-10-21 19:18:22 +03:00
Sergey Matvienko
7f1f298774 cassandra buffered rate executor: separate beans for read and write operations 2021-10-21 19:07:53 +03:00
Viacheslav Klimov
a852e11a3d Refactor bulk import 2021-10-21 19:06:17 +03:00
Andrew Shvayka
3f163e3ee5
Merge pull request #5418 from YevhenBondarenko/feature/swagger 
[3.3.2] added descriptions for the queue, ota and resource controllers
 2021-10-21 19:02:19 +03:00
YevhenBondarenko
e2676f30da Added access validation for RPC 2021-10-21 19:01:04 +03:00