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

1888 Commits

Author SHA1 Message Date
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +02:00
ViacheslavKlimov
17e4b322c1 Set notificationRuleId in TbCreateAlarmNode 2022-12-06 10:19:08 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
zbeacon
591708b029 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-05 15:23:09 +02:00
Igor Kulikov
f7c630d276 Update rule nodes UI 2022-12-01 17:56:26 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
Igor Kulikov
09b3c93b46 Update rule nodes UI 2022-11-28 16:31:42 +02:00
Andrew Shvayka
8c7371ae8c
Merge pull request #7687 from ShvaykaD/bugfix/jsonpath-node-primitive-output 
[3.4.2] Fix json path node class cast exception
 2022-11-28 14:54:18 +02:00
Andrew Shvayka
90238ffaa8
Merge pull request #7684 from ShvaykaD/bugfix/7683 
[3.4.2] Missed logic for sending attributes deleted notification to device in the Delete Attributes node
 2022-11-28 14:51:12 +02:00
ShvaykaD
77e4ab6a5e fix json path node class cast exception 2022-11-25 20:05:49 +02:00
ShvaykaD
2502041aa5 bugfix #7683: refactoring after PR review 2022-11-25 17:03:05 +02:00
ShvaykaD
3820909d65 bugfix: #7683 2022-11-25 16:36:32 +02:00
Vladyslav_Prykhodko
5b502f358d Updated rulenode-core-config.js 2022-11-24 18:31:02 +02:00
Andrii Shvaika
126eeb6a4b Backport ability to specify scope in the metadata 2022-11-24 17:53:10 +02:00
Andrii Shvaika
045608ae52 Minor description change 2022-11-24 17:45:36 +02:00
Andrii Shvaika
fce479985d Merge remote-tracking branch 'Bratka/feature/attribute_nodes_add_options_send_notification' 2022-11-24 17:36:19 +02:00
ShvaykaD
1a8a02cfa4 updated save attributes node decription 2022-11-24 13:10:25 +02:00
ShvaykaD
a542b7d593 added client scope validation for sending notification 2022-11-24 11:34:24 +02:00
Igor Kulikov
ceac2a9f3c Update TBEL help Ids 2022-11-22 18:23:37 +02:00
Igor Kulikov
bed4d61281 Update TBEL help links 2022-11-22 18:12:46 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
Yuriy Lytvynchuk
c0dcd5e462 update tests 2022-11-22 16:30:57 +02:00
Yuriy Lytvynchuk
c6ffdb41af delete imports 2022-11-22 15:07:00 +02:00
Yuriy Lytvynchuk
e77c939b67 refactor code, update logic callback 2022-11-22 14:58:46 +02:00
Yuriy Lytvynchuk
29d3efa205 add options send notifications 2022-11-22 14:33:52 +02:00
Yuriy Lytvynchuk
dabcdc2464 fix fetch device credentials 2022-11-18 09:53:15 +02:00
Andrew Shvayka
96e7672d9e
Merge pull request #7587 from smatvienko-tb/feature/http_header_as_array_if_multivalue 
[3.4.2] HTTP client returns headers as an array if there is more than one
 2022-11-16 16:51:20 +02:00
Sergey Matvienko
86127d662b Merge remote-tracking branch 'ce/master' into feature/http_header_as_array_if_multivalue 2022-11-15 13:25:22 +01:00
Yuriy Lytvynchuk
1564ba76f1 add checkEntityType for init node 2022-11-15 09:38:56 +02:00
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
Yuriy Lytvynchuk
f49b349396 refactor code 2022-11-11 12:50:55 +02:00
Yuriy Lytvynchuk
a00d68f477 delete cases: TENANT, DASHBOARD, CUSTOMER 2022-11-11 10:06:02 +02:00
Volodymyr Babak
d8a6093442 Added TbSendRPCReplyNodeTest 2022-11-10 11:36:46 +02:00
Volodymyr Babak
15b26f4317 Remove Nullable annotation 2022-11-10 10:37:14 +02:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00
Volodymyr Babak
8b46b30747 Merge remote-tracking branch 'upstream/master' into feature/edge-rpc-call-from-device 2022-11-09 18:34:01 +02:00
Volodymyr Babak
5ff8144f8d Code cleanup 2022-11-09 18:31:08 +02:00
Sergey Matvienko
d9774ccfda http client returns headers as array is there is more than one, put headers to metadata for failure response 2022-11-09 13:06:28 +02:00
Volodymyr Babak
d1312cb917 Added serviceId and sessionId to deviceRpcCallmsg 2022-11-09 12:54:17 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
ShvaykaD
a02a276cf9 Fix code formatting issue in TenantIdLoaderTest 2022-11-08 10:59:38 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02:00
ViacheslavKlimov
e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-06 18:55:41 +02:00
ViacheslavKlimov
12ae902cfc Notification rules initial implementation 2022-11-06 18:13:02 +02:00
ShvaykaD
2f83810fe4 fix compilation error in alarm service & code cleanup 2022-11-04 14:54:56 +02:00
ShvaykaD
82440e4d53 Merge branch 'master' into feature/check_tenant_entity_for_nodes 2022-11-04 13:41:15 +02:00
Andrii Shvaika
a5691f9347 Fix for the attributes mapper 2022-11-03 15:58:22 +02:00