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

342 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
3eba03cccc Fixed after merge 'upstream/develop/3.5' 2023-02-14 11:39:29 +02:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
Vladyslav_Prykhodko
8174a97926 Merge with klimov/feature/notification-system 2023-01-31 17:46:12 +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
ViacheslavKlimov
be5eed96dc Slack notification target; refactoring 2023-01-30 14:50:44 +02:00
ViacheslavKlimov
4bfacad698 API for marking all as read; additionalConfig for push-notification 2023-01-19 12:55:47 +02:00
ViacheslavKlimov
b7f3aef044 Notification rules; refactoring 2023-01-17 16:30:47 +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
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
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +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
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
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
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
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
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +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
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
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +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