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

1467 Commits

Author SHA1 Message Date
ShvaykaD
b8eb239c39 Merge branch 'develop/3.5.1' of github.com:thingsboard/thingsboard into feature/enrichment-rule-nodes-improvements 2023-05-18 18:57:26 +03:00
ShvaykaD
cfcf539c50 added upgrade logic tests && added fixes for review comments 2023-05-18 18:55:00 +03:00
ShvaykaD
21e5a1a130 added logic update to the rule nodes upgrade script 2023-05-17 18:03:35 +03:00
ShvaykaD
5831876b8e added upgrade script logic for all enrichment rule nodes && additional improvements to TbGetRelatedAttributeNode 2023-05-16 15:57:30 +03:00
YevhenBondarenko
6fda898851 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6 2023-05-15 12:09:22 +02:00
AndriiD
f95c64591e fixed pr comments 2023-05-15 11:52:05 +03:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
ShvaykaD
fb164f0e24 merge with develop 3.5.1 2023-05-10 14:22:24 +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
Vladyslav_Prykhodko
a08f9f750b Updated rulenode-core-config.js: Fixed incorrect show credentials 2023-05-04 16:47:42 +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
ShvaykaD
d49c83b264 changed exception text for mapping based rule nodes 2023-05-03 16:33:59 +03:00
Dmytro Skarzhynets
bc18c81087 Fix: fix change originator node test 2023-05-03 12:05:54 +03:00
Dmytro Skarzhynets
3b405ccd84 Refactor: fixed tests after fixing merge conflicts 2023-05-02 17:08:35 +03:00
ShvaykaD
6266f6763e merge with develop/3.5 2023-05-02 16:15:15 +03:00
Dmytro Skarzhynets
d7b8e2daef Refactor: remove pointless tests 2023-05-02 15:45:21 +03:00
Dmytro Skarzhynets
bf2181fcdd Refactor: fix typo, replace direct executor with db callback executor 2023-05-02 14:55:06 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
Andrew Shvayka
d03f236263
Merge pull request #8440 from thingsboard/improvements/notification-system 
Improvements for notification system
 2023-05-01 12:43:48 +03: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
ViacheslavKlimov
c542bb9b16 Notification system API description for Swagger 2023-04-27 13:55:16 +03:00
Vladyslav_Prykhodko
49ee303273 Updated rulenode-core-config: added support TBEL linter 2023-04-27 12:03:58 +03:00
Igor Kulikov
a736f177ef Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-26 18:08:13 +03:00
Andrew Shvayka
abd843b6f5
Merge pull request #8423 from thingsboard/improvements/notification-system 
Fixes for notification system
 2023-04-25 18:03:15 +03:00
Andrew Shvayka
4dd5280191
Merge pull request #8414 from thingsboard/feature/singleton-rule-node 
Feature/singleton rule node
 2023-04-25 14:34:08 +03:00
ViacheslavKlimov
f44de42165 Available delivery methods check: don't check mail server connection 2023-04-25 14:31:09 +03:00
ViacheslavKlimov
0ce243f2e7 Merge with develop/3.5 2023-04-25 12:26:25 +03:00
Andrew Shvayka
b6efa77605
Merge pull request #8425 from YevhenBondarenko/fix/log-node 
fexed NPE in log node
 2023-04-24 19:34:35 +03:00
YevhenBondarenko
bd05d35f73 fexed NPE (if spript lang is null) 2023-04-24 17:55:44 +02:00
ViacheslavKlimov
b71257ba23 User title template param, improve notification preview, improve default notifications 2023-04-24 15:47:00 +03:00
Andrew Shvayka
76f24827aa
Merge pull request #8398 from dashevchenko/newMessageTypes 
Added new message types to rule engine
 2023-04-24 15:00:33 +03:00
YevhenBondarenko
da0bd1dc92 renamed SingletonSupport to ClusteringMode and refactoring due to comments 2023-04-24 13:49:57 +02:00
dashevchenko
62e9605971 renamed ALARM_ASSIGN to ALARM_ASSIGNED 2023-04-24 13:01:06 +03:00
dashevchenko
7d749af391 refactoring 2023-04-24 12:07:37 +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
YevhenBondarenko
5b3be81886 renamed msg types 2023-04-21 18:41:23 +02:00
Igor Kulikov
0032490a19 Merge with develop/3.5 2023-04-21 18:45:44 +03:00
Igor Kulikov
14c61f65e9 UI: Alarm count datasource type support. Improve alarm filters. 2023-04-21 18:00:56 +03:00
YevhenBondarenko
a0b0e31e7d Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/singleton-rule-node 2023-04-21 10:07:17 +02:00
YevhenBondarenko
3261cf4fe3 implemented rule node singleton mode 2023-04-20 16:07:14 +02:00
Andrew Shvayka
f71e6437c1
Merge pull request #8389 from thingsboard/fix/device-by-id-async 
Remove usages of findDeviceByIdAsync
 2023-04-20 13:10:46 +03:00
ShvaykaD
fbb0043323 fix deduplication node description 2023-04-20 13:04:29 +03:00
dashevchenko
01c6147766 added new message types to rule engine 2023-04-20 10:12:02 +03:00
ViacheslavKlimov
079b2a5ab7 Remove findDeviceByIdAsync from DeviceService 2023-04-18 18:25:35 +03:00
Dmytro Skarzhynets
2e6678c851 Refactor: node renaming rollback 2023-04-18 14:02:22 +03:00
Dmytro Skarzhynets
39e9ab26e3 Refactor: add realistic mapping in originator fields node 2023-04-18 13:46:21 +03:00
Dmytro Skarzhynets
df25091f3c Refactor: add assertion for exceptions in customer details node 2023-04-18 13:32:48 +03:00
Dmytro Skarzhynets
ff5652a607 Refactor: fix lenient usage in fetch device credentials node 2023-04-18 13:17:57 +03:00
Dmytro Skarzhynets
cf1a5feb04 Refactor: flip ifs in calculate delta node 2023-04-18 13:09:22 +03:00