325 Commits

Author SHA1 Message Date
Dmytro Skarzhynets
f29e1f5fef Add fetch to logic, fix and add tests for some rule nodes 2023-03-23 12:44:23 +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
ShvaykaD
2dcd949921 deduplication rule node: first stage without redis 2023-01-17 14:47:47 +02:00
ShvaykaD
ea099ae70a deduplication rule node: first stage without redis 2023-01-16 15:55:36 +02:00
Andrew Shvayka
a190ef3ccf
Merge pull request #7762 from dashevchenko/alarmComments
[3.5] Alarm comments feature
2023-01-13 18:40:20 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
dashevchenko
d3a975770b Merge remote-tracking branch 'upstream/master' into alarmComments 2023-01-09 12:38:21 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
dashevchenko
ed37dc850a merged with master 2022-12-20 12:09:34 +02:00
dashevchenko
b567341481 added DeviceProfileService and AssetProfileService to TBContext 2022-12-15 12:36:23 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +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
3820909d65 bugfix: #7683 2022-11-25 16:36:32 +02:00
ShvaykaD
2f83810fe4 fix compilation error in alarm service & code cleanup 2022-11-04 14:54:56 +02:00
Andrii Shvaika
646504ac50 Tenant Id Loader fixes 2022-11-03 15:51:18 +02:00
Yuriy Lytvynchuk
b5f11f1bd0 Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
2022-11-03 14:10:48 +02:00
Yuriy Lytvynchuk
8b9eb43322 refactor code 2022-11-03 14:06:42 +02:00
Yuriy Lytvynchuk
15683504fd refactor & update logic 2022-11-02 15:22:33 +02:00
Yuriy Lytvynchuk
4744f93cda Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes 2022-11-01 10:31:05 +02:00
Andrii Shvaika
bfe79780dd MVEL executor improvements 2022-10-27 14:03:48 +03:00
Andrew Shvayka
73868338c8
Merge pull request #7238 from YuriyLytvynchuk/feature/delete_attributes_node
[3.4.2] Feature: New RuleNode "delete attributes"
2022-10-24 13:34:55 +03:00
Andrii Shvaika
3f729a8ca0 MVEL improvements 2022-10-20 17:05:53 +03:00
Andrii Shvaika
2349b16b55 MVEL executor support in rule nodes 2022-10-19 17:49:59 +03:00
Andrii Shvaika
d3f06bd3a4 MVEL executor implementation 2022-10-18 18:39:43 +03:00
Yuriy Lytvynchuk
6edec4a94c 1. rename checkTenantEntity -> isTenantEntity
2. Refactor code
2022-10-07 11:01:55 +03:00
Igor Kulikov
f14a337c73 Merge branch 'master' into feature/math-rule-node 2022-09-28 15:01:46 +03:00
Yuriy Lytvynchuk
90fc76e762 Merge remote-tracking branch 'upstream/master' into feature/delete_attributes_node
# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
2022-09-28 14:40:40 +03:00
Yuriy Lytvynchuk
ef97f12724 add checkTenantEntity 2022-09-28 09:55:58 +03:00
Andrew Shvayka
7eaa942036
Merge pull request #7342 from thingsboard/feature/assetProfile
[3.4.2] Asset Profiles Feature
2022-09-27 17:02:32 +03:00
Igor Kulikov
7d19a1d5e9 Update assetCreatedMsg and alarmActionMsg to handle rule chain and queue name from asset profile 2022-09-27 16:12:01 +03:00
Yuriy Lytvynchuk
5a6cf5c92f refactor code & test 2022-09-26 12:54:17 +03:00
Andrii Shvaika
fb49273bd6 Math node implementation 2022-09-23 18:06:33 +03:00
Yuriy Lytvynchuk
12148c8a60 modify callback 2022-09-23 16:39:53 +03:00
Igor Kulikov
afa69f6f78 Merge branch 'master' into feature/assetProfile 2022-09-23 15:37:52 +03:00
Igor Kulikov
085e3c1580 Implement Asset Profile feature 2022-09-23 15:37:17 +03:00
Yuriy Lytvynchuk
f2890d3363 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/node_fetch_device_credentials 2022-09-23 10:42:51 +03:00
Andrii Shvaika
7c4d408085 Merge PR #7316 2022-09-22 16:44:29 +03:00
ShvaykaD
ad3e484998 set default for destroy method in TbNode interface 2022-08-19 16:56:36 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Andrii Shvaika
8de1ee776c Fix conflicts. Refactored RandomStringUtils 2022-08-16 11:26:32 +03:00
Yuriy Lytvynchuk
4712118ce2 new RuleNode 'fetch device credentials' 2022-07-27 14:13:37 +03:00
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +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
Andrii Shvaika
cd633c72c8 No more Queue Id in the Device Profile 2022-07-12 12:56:40 +03:00
thingsboard
c7daaa571e replace StringUtils usages with in-repository implementation 2022-07-12 12:08:52 +03:00
ivankozka
33b502e156 add timeoutExecutor to prevent deadlocks; fix not using timeout from configuration in TbSendEmailNode 2022-07-06 13:32:30 +03:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00