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

1369 Commits

Author SHA1 Message Date
dashevchenko
7792fe7293 deleted unused imports 2023-01-13 17:55:01 +02:00
dashevchenko
e8d651a108 fixed audit logs 2023-01-12 18:42:47 +02:00
dashevchenko
071b68e938 Alarm comment is not entity any more 2023-01-12 16:35:10 +02:00
zbeacon
f9e1077bca Updated findSeverity method 2023-01-12 10:03:04 +02:00
ViacheslavKlimov
7524dd9258 Remove NotificationOriginatorType, use EntityType; refactor NotificationInfo 2023-01-11 15:18:22 +02:00
ViacheslavKlimov
38c9d5dcd8 Move delivery methods to notification template; refactoring 2023-01-11 14:58:18 +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
ViacheslavKlimov
1317a8aca9 Rename WebSocket delivery method to push-notification; refactoring 2023-01-06 18:34:35 +02:00
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
zbeacon
d9add9bdf8 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-29 20:49:29 +02:00
AndriiD
fdf7f117f7 Merge branch 'master' into feature/prod-1586_add_quename_to_generator_node 
# Conflicts:
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java
 2022-12-29 12:15:40 +02:00
AndriiD
0878073ff7 init 2022-12-29 12:14:08 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
Andrii Landiak
7e346894fb Remove quotes if needed 2022-12-27 12:02:43 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
Sergey Matvienko
53e7ead94c log node fix: for new LogRuleNode MVEL script ignored as it considered standard, because the JS script was standard. Test added for any new script type 2022-12-22 17:22:37 +01:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
dashevchenko
408afb67f3 fixed test 2022-12-21 16:10:34 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
dashevchenko
ed37dc850a merged with master 2022-12-20 12:09:34 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
dashevchenko
b567341481 added DeviceProfileService and AssetProfileService to TBContext 2022-12-15 12:36:23 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
Yuriy Lytvynchuk
603f71bbe2 fix empty array & nodeDetails 2022-12-13 16:09:36 +02:00
Volodymyr Babak
0cd2ad03ad Added support of USER entity in Push to Edge / Push to Cloud rule nodes 2022-12-13 14:42:36 +02:00
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