ViacheslavKlimov
|
a56261ac9d
|
Merge with develop/3.5
|
2023-03-08 13:11:31 +02:00 |
|
Andrii Shvaika
|
69b5a5f425
|
Alarm Service refactoring
|
2023-02-23 19:03:04 +02:00 |
|
Andrii Shvaika
|
c922bbb989
|
Alarm service refactroing
|
2023-02-23 12:31:07 +02:00 |
|
Andrii Shvaika
|
c16dfd4407
|
Alarm query updates
|
2023-02-17 16:15:17 +02:00 |
|
Andrii Shvaika
|
04eb8c989a
|
Revert the AlarmInfo items. We will update the assignee via separate message
|
2023-02-16 18:47:51 +02:00 |
|
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 |
|
zbeacon
|
9250af1904
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-02-13 19:55:24 +02:00 |
|
zbeacon
|
26a9f10109
|
Updated alarm websocket subscriptions
|
2023-01-31 18:41:41 +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 |
|
zbeacon
|
2524965ea1
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-01-18 16:03:11 +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 |
|
zbeacon
|
44dcda3bc5
|
Changes, accroding to comments
|
2023-01-17 08:15:00 +02:00 |
|
ShvaykaD
|
ea099ae70a
|
deduplication rule node: first stage without redis
|
2023-01-16 15:55:36 +02:00 |
|
zbeacon
|
5494bc7d2b
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-01-16 10:00:45 +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 |
|
zbeacon
|
f9e1077bca
|
Updated findSeverity method
|
2023-01-12 10:03:04 +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 |
|
zbeacon
|
d9add9bdf8
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-29 20:49:29 +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 |
|
zbeacon
|
5710f01c03
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-22 08:30:42 +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 |
|
zbeacon
|
591708b029
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-05 15:23:09 +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 |
|
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 |
|