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

1164 Commits

Author SHA1 Message Date
YevhenBondarenko
1a12d3c395 merge with develop/3.6 2023-06-29 23:40:43 +02:00
Andrii Shvaika
ecae72e994 Merge with develop/3.5.2 2023-06-29 17:00:23 +03:00
ViacheslavKlimov
0bd7f74c47 Fix issues 2023-06-13 14:12:54 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-13 13:49:51 +03:00
YevhenBondarenko
ce87bc5e13 to springdoc migration 2023-06-12 13:25:37 +02:00
ShvaykaD
138128d837 added more logs to RPC processing logic in MQTT and CoAP transports 2023-06-07 15:18:45 +03:00
ShvaykaD
d500d5cb17 updated RPC based logs to use RPC keyword instead of rpc 2023-06-06 14:30:02 +03:00
YevhenBondarenko
7f9a9c7fb3 merge with develop/3.6 2023-06-05 15:58:16 +02:00
YevhenBondarenko
db6f310284 migration to spring boot 3.1 2023-06-05 15:24:47 +02:00
Andrii Shvaika
4c470583f3 Correct package name 2023-06-02 16:31:38 +03:00
Andrii Shvaika
c9966ef3ef Extracted proto files to a separate module 2023-06-02 16:27:06 +03:00
ViacheslavKlimov
2f560315d1 Exceeded rate limits notifications; their deduplication; refactoring 2023-06-02 15:09:09 +03:00
Andrii Shvaika
790513788a Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6 2023-06-02 14:59:40 +03:00
Igor Kulikov
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Andrii Shvaika
b37a708f40 Fix invalid return code for legacy 3.x MQTT clients 2023-05-30 12:01:32 +03:00
YevhenBondarenko
c29e0dbf75 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-29 14:48:45 +02:00
ShvaykaD
b2ca9ce086 added logic to cleanup rpcAwaitingAck map when before session close 2023-05-29 14:08:53 +03:00
Andrii Shvaika
da90c21b6c Merge with develop/3.5.2. Version set to 3.6.0-SNAPSHOT 2023-05-29 13:45:17 +03:00
Andrii Shvaika
2a1259570b Temporary version set to 3.5.2-SNAPSHOT to merge 2023-05-29 13:43:10 +03:00
Andrii Shvaika
bf63eaccfe Merge branch 'master' into develop/3.5.2 2023-05-22 17:50:05 +03:00
Andrew Shvayka
07cba2b16c
Merge pull request #8598 from dashevchenko/xxe_fixed 
Fixed xxe vulnerability
 2023-05-22 17:46:51 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
dashevchenko
9b461272c4 fixed xxe vulnerability 2023-05-22 13:11:14 +03:00
YevhenBondarenko
f2545fb942 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-19 19:06:45 +02:00
YevhenBondarenko
b5bce3e187 merge with develop/3.5.1 2023-05-19 19:03:11 +02:00
YevhenBondarenko
bba26ca676 merge with develop/3.5.1 2023-05-19 18:20:27 +02:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil 
[3.5.1]Replace object mapper usages with jackson utils
 2023-05-19 17:07:16 +03:00
YevhenBondarenko
6fda898851 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6 2023-05-15 12:09:22 +02:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
AndriiD
7187fbb4d3 Replace object mapper usages with jackson utils 2023-05-10 14:10:58 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
AndriiD
32e5d8561b Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
 2023-05-04 14:35:41 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
YevhenBondarenko
40d6e67131 migrate to java 17 2023-05-02 00:46:34 +02:00
AndriiD
73833a666b Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
 2023-04-28 15:08:44 +03:00
Andrii Shvaika
8e20fd8800 Metric wildcards and default attributes 2023-04-27 17:08:34 +03:00
Andrii Shvaika
a405999a88 Use shared attributes for sparkplug devices 2023-04-25 19:03:17 +03:00
YevhenBondarenko
4977108550 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.6 2023-04-21 19:34:31 +02:00
Andrii Shvaika
a0c370079e Improve the device name 2023-04-20 18:00:34 +03:00
AndriiD
2ea6896507 Merge remote-tracking branch 'origin/develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
 2023-04-17 00:22:12 +03:00
Andrew Shvayka
d2fc5c7b77
Merge pull request #8358 from thingsboard/feature/x509-device-provisioning 
Feature/x509 device provisioning
 2023-04-14 14:30:24 +03:00
Andrii Landiak
1fc8d7a52b Add validation for X509 trusted chain 2023-04-14 13:26:28 +03:00
AndriiD
dd9c055ecf replace_ObjectMapper_usages_with_JacksonUtil 2023-04-14 11:58:24 +03:00
Andrii Shvaika
7988a58c37 Protection from garbage in redis 2023-04-13 17:12:59 +03:00
Andrii Shvaika
4cea4362dc Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning 2023-04-12 12:47:41 +03:00
Andrii Landiak
df18155c81 Refactoring 2023-04-07 18:02:25 +03:00
Andrew Shvayka
838c2f5d33
Merge pull request #7857 from ShvaykaD/improvements/report-device-activity-on-rpc-processing 
Improvements for reporting device activity during RPC processing
 2023-04-07 15:50:28 +03:00