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

420 Commits

Author SHA1 Message Date
Andrii Shvaika
2a1259570b Temporary version set to 3.5.2-SNAPSHOT to merge 2023-05-29 13:43:10 +03:00
YevhenBondarenko
b5bce3e187 merge with develop/3.5.1 2023-05-19 19:03:11 +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
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
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
AndriiD
dd9c055ecf replace_ObjectMapper_usages_with_JacksonUtil 2023-04-14 11:58:24 +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
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
Andrii Landiak
55adb3d12a Refactor x509: add logic of rotating x509 credentials and creating new device to DeviceProvisionService 2023-04-07 13:07:08 +03:00
Andrii Landiak
2ac861876e Refactoring: fix conflict, add logs 2023-03-29 11:40:41 +03:00
Andrii Landiak
e665917758 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-10 15:46:42 +02:00
YevhenBondarenko
265e33241a version set to 3.6.0-SNAPSHOT 2023-03-10 14:45:49 +01:00
Andrew Shvayka
e058786956
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions 
[3.5] junit5 migration - exception annotation refactoring
 2023-03-10 12:51:03 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Oleksandra Matviienko
b27c007a5d junit5: JsonConverterTest migrated 2023-03-06 11:08:31 +01:00
Oleksandra Matviienko
ea2e87e73e junit5: JsonConverterTest test annotation exceptions refactoring 2023-03-06 10:49:57 +01:00
Andrii Shvaika
6b121514fc Merge with develop/3.5 2023-02-28 19:06:54 +02:00
nickAS21
524952d264 sparkplug: rpc device 2023-02-15 14:19:10 +02:00
Andrii Landiak
60c7d213cc Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-02-02 10:06:55 +02:00
Andrii Landiak
e9586daf9d Add unit tests and update regex pattern to convert chain to list 2023-01-31 18:04:45 +02:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
Andrii Landiak
7957da4a9e Updated: send full chain to kafka with single message and do whole logic on core 2023-01-20 19:02:14 +02:00
Andrii Landiak
5d35fa1f26 Add ability to upgrade device credentials if chain match with uploaded device profile certificate. 2023-01-12 17:18:29 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
ShvaykaD
6e71abe10b improvements for report device activity during RPC processing 2022-12-27 11:46:54 +02:00
Andrii Shvaika
38ef27567c Refactoring of the initial implementation 2022-12-21 14:21:36 +02:00
nickAS21
ca54838f23 sparkplug: comments7 2022-12-21 08:08:16 +02:00
nickAS21
f6aa9e6125 sparklug: comments4 2022-12-15 18:44:25 +02:00
nickAS21
1bf02b75f2 sparkplug: connection 2022-12-15 11:40:04 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
ShvaykaD
2502041aa5 bugfix #7683: refactoring after PR review 2022-11-25 17:03:05 +02:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
Andrii Shvaika
609107468c Api Usage Client refactoring 2022-10-20 14:29:11 +03:00
Andrii Shvaika
9769f95c27 Refactoring of the JS API to separate module: Script API 2022-10-17 16:36:57 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Andrii Shvaika
0bc5be477c Coap Device Profile Update fix 2022-08-17 16:55:22 +03:00
Andrii Shvaika
8de1ee776c Fix conflicts. Refactored RandomStringUtils 2022-08-16 11:26:32 +03:00
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +03:00
ShvaykaD
2c40bf13cf merge with develop/3.4 2022-07-19 14:09:47 +03:00
thingsboard
87325bcd10 Merge remote-tracking branch 'origin/develop/3.4' into feature/work-1581-replace-deprecated-stringutils 2022-07-13 13:33:17 +03:00