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

819 Commits

Author SHA1 Message Date
YevhenBondarenko
f0c2b5df35 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.3.3 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
#	ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts
 2021-12-16 15:47:51 +02:00
Andrew Shvayka
a89b40de46
Merge pull request #5577 from YevhenBondarenko/feature/lwm2m-improvements 
[3.3.3] added ability to configure network configuration for lwm2m
 2021-12-10 17:11:17 +02:00
Andrii Shvaika
435d76c107 Merge with master 2021-12-08 16:46:45 +02:00
Igor Kulikov
b5da8752c5 Use output rule node name instead of label 2021-12-08 16:23:54 +02:00
Igor Kulikov
d6e18d05cd Introduce Flow rule node type. Add rile node UIs for RuleChain input/output. Remove rule chain connection metadata. 2021-12-08 15:35:59 +02:00
Igor Kulikov
9c6732e61b Merge branch 'master' into feature/nested-rule-chains 2021-12-08 11:08:54 +02:00
Andrii Shvaika
d3c20b2e57 Alarm Query performance improvements 2021-12-07 18:50:16 +02:00
YevhenBondarenko
231508b66b logging improvements 2021-12-06 10:59:58 +02:00
Andrii Shvaika
9cf0ab6900 Rename of the related rule chains when customer renames the output label 2021-12-02 20:00:24 +02:00
Andrii Shvaika
c3fa9b9f43 Nested rule chains 2021-12-02 19:13:18 +02:00
Sergey Tarnavskiy
f9aab73e92 Added new option for including Bootstrap Serer updates 2021-11-26 17:53:06 +02:00
Igor Kulikov
7187ecfdb1 Version set to 3.3.3-SNAPSHOT 2021-11-24 12:24:27 +02:00
Andrii Shvaika
c51ade482a Merge with master 2021-11-24 12:00:11 +02:00
YevhenBondarenko
52578645b8 added ability to configure network configuration for lwm2m 2021-11-17 13:01:00 +02:00
nickAS21
fbc785a471 lwm2m - Bootstrap auto 2021-11-15 19:11:53 +02:00
nickAS21
6892074646 lwm2m - Security config default 2021-11-11 17:16:47 +02:00
nickAS21
781ef66f0b lwm2m - upDate lwm2mServer 2021-11-11 15:09:34 +02:00
Viacheslav Klimov
7801c3d7aa Fix up fields length validation for rule nodes and alarm rules 2021-11-09 15:49:26 +02:00
Andrii Shvaika
a8371eaf88 Merge remote-tracking branch 'origin/develop/3.3.2' into develop/3.3.3 2021-11-09 13:14:37 +02:00
nickAS21
de71dd24b8 lwm2m - rename file 2021-11-09 13:12:21 +02:00
nickAS21
0ac80664e4 lwm2m - profile bootstrap config 2021-11-09 12:35:05 +02:00
nickAS21
e1442c38bb lwm2m - profile&device bootstrap M4 2021-11-08 21:56:26 +02:00
Andrii Shvaika
23c6144c20 Develop 3.3.3 2021-11-08 17:41:03 +02:00
Andrii Shvaika
942c316e8a Merge with master 2021-11-08 17:36:49 +02:00
Vladyslav_Prykhodko
f02304e2f3 Add max fields length validation 2021-11-08 17:23:27 +02:00
Sergey Matvienko
3003ee6e08 TimePageLink callSuper = true for ToString and EqualsAndHashCode 2021-11-08 11:03:07 +02:00
Igor Kulikov
d511bd22a4
Remove redundant length constraint for comment field 2021-11-06 16:42:25 +02:00
Andrew Shvayka
676a60e804
Revert "[3.3.3] Entities search within all tenants" 2021-11-05 18:26:53 +02:00
Andrew Shvayka
8e0eab37a8
Merge pull request #5474 from ViacheslavKlimov/sysadmin-entities-search 
[3.3.3] Entities search within all tenants
 2021-11-05 18:26:03 +02:00
Vladyslav_Prykhodko
25d8f4d3c0 Added fields length validation 2021-11-05 17:51:10 +02:00
nickAS21
8f93f6dd06 lwm2m - profile&device rename 2021-11-04 17:37:19 +02:00
Andrew Shvayka
71bed873b0
Merge pull request #5166 from ViacheslavKlimov/fields-validation 
[3.3.2] Fields length validation
 2021-11-04 16:56:14 +02:00
nickAS21
4efa360f5c lwm2m - profile fix bug server config 2021-11-04 16:26:44 +02:00
Viacheslav Klimov
17f9eebe23 Set serialVersionUIDs for cached entities 2021-11-04 16:25:15 +02:00
Igor Kulikov
7c2b3a9fbf Improve REST API error response handling. Update swagger api. 2021-11-04 15:26:36 +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
nickAS21
bad6653a50 lwm2m - update lwm2mController by base64 and createte BootstrpServerCredentials by Profile (Base64 validate) 2021-11-03 23:28:28 +02:00
Andrii Shvaika
b3534942a5 Entity Id and Swagger description 2021-11-03 16:18:00 +02:00
Viacheslav Klimov
aaead618aa Set serialVersionUID for DeviceProfile class 2021-11-03 13:23:35 +02:00
Viacheslav Klimov
8d28a28b08 Implement entities search within all tenants 2021-11-01 20:04:35 +02: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
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
Igor Kulikov
483a69fed1 Use SSL credentials configuration to setup HTTPS. Enable Lwm2m credentials by default. 2021-10-27 14:19:50 +03:00
ShvaykaD
ac12eaecd8 Merge branch 'master' of github.com:ShvaykaD/thingsboard into feature/json-payload-for-v1-topics-in-proto-profile 2021-10-27 11:52:37 +03:00
Andrii Shvaika
f015a3a45c Merge with master 2021-10-26 19:54:00 +03:00
Igor Kulikov
362ccf9f31 Unified transport SSL credentials 2021-10-26 19:40:38 +03:00
ShvaykaD
75c1185d18 update logic after review 2021-10-26 17:25:27 +03:00
ShvaykaD
5f6b1d1ab3 MQTT backward compatibility adaptor: init commit 2021-10-26 12:59:05 +03:00
Andrii Shvaika
4443fbcb27 Refactoring of Save Device With Credentials 2021-10-25 11:43:53 +03:00