920 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
88128640e9 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-14 16:37:50 +02:00
Vladyslav_Prykhodko
c6230a48b8 UI: Fix notification after change API 2023-03-14 16:37:05 +02:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Vladyslav_Prykhodko
75e0f335b9 UI: Change notification style and send notification error 2023-03-10 18:23:25 +02:00
Igor Kulikov
926c364575 UI: Router tabs component improvements. Remove alarm rules page. 2023-03-10 14:58:16 +02:00
Igor Kulikov
0780669498 Merge with develop/3.5 2023-03-10 12:56:00 +02:00
Andrew Shvayka
20e4905e84
Merge pull request #8186 from thingsboard/feature/mqtt/sparkplug
MQTT Sparkplug protocol support
2023-03-10 12:45:59 +02:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system
# Conflicts:
#	pom.xml
2023-03-08 18:16:16 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Igor Kulikov
11f54d96fd UI: Improve default time window calculation 2023-03-08 16:02:04 +02:00
Igor Kulikov
3688c6aa44 UI: Improve default time window calculation 2023-03-08 15:45:39 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
rusikv
411da14083 Moved changed to optional assignee id in alarm query constructor to end 2023-03-07 18:30:58 +02:00
Volodymyr Babak
dc7e872b16 Fixed correct approach for deprecated ts field 2023-03-03 13:44:12 +02:00
Volodymyr Babak
c2b1a948da Removed check of deprecated entity alias filter type from backend to frontend 2023-03-03 10:17:42 +02:00
Andrii Shvaika
6b121514fc Merge with develop/3.5 2023-02-28 19:06:54 +02:00
rusikv
d5d2b043a2 Merge branch 'alarmCommentsUI' of github.com:rusikv/thingsboard into alarmCommentsUI 2023-02-24 16:23:16 +02:00
Vladyslav_Prykhodko
902cd73000 UI: Add support in web notification action open dashboard 2023-02-24 11:29:36 +02:00
rusikv
80ec4d85e2 Amendments due to backend changes, added ability to search users by name and email, added setting to disable reassignment of alarm to alarm widget 2023-02-20 14:13:41 +02:00
Vladyslav_Prykhodko
6945b96e3c UI: Change notification request support send without template 2023-02-20 11:30:26 +02:00
Vladyslav_Prykhodko
8589047fcc UI: Refactoring web socket 2023-02-16 12:59:43 +02:00
Vladyslav_Prykhodko
82719b89ef UI: Improvement notification componets styles 2023-02-14 18:16:29 +02:00
Igor Kulikov
290e15ecb8 UI: Use user settings service. 2023-02-14 12:04:23 +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
Igor Kulikov
916faae774 UI: Menu improvements 2023-02-13 19:09:05 +02:00
Vladyslav_Prykhodko
72348b049e UI: add create notification and template from other wizard 2023-02-10 18:32:21 +02:00
rusikv
372450e0d7 Date ago pipe update, added ability to change sort direction of comments 2023-02-10 16:17:12 +02:00
rusikv
a943e04e2d Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentsUI 2023-02-10 15:49:24 +02:00
Igor Kulikov
61e117f320 UI: Refactor menu for System administrator 2023-02-09 19:13:44 +02:00
Vladyslav_Prykhodko
3bbf69c894 Improvement notification alarm style 2023-02-09 12:31:06 +02:00
Volodymyr Babak
5c0736e76b Merge remote-tracking branch 'upstream/develop/3.5' into filter-type-multiple-types 2023-02-08 15:10:32 +02:00
Andrii Shvaika
8bd9f2e29c Merge with release 3.4.4 2023-02-07 18:47:38 +02:00
Andrii Shvaika
25db432715 Missing Filter Node links 2023-02-07 15:21:43 +02:00
Artem Dzhereleiko
cc832762bb UI: Add notification template 2023-02-06 13:31:00 +02:00
Igor Kulikov
d8275d2035 UI: Angular 14 migration 2023-02-06 13:09:43 +02:00
Igor Kulikov
3aed9db82f UI: Angular 14 migration 2023-02-02 16:55:27 +02:00
Igor Kulikov
21cd557d96 UI: Angular 14 migration 2023-02-02 15:55:06 +02:00
Vladyslav_Prykhodko
91440c41f9 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-02-02 15:34:39 +02:00
Vladyslav_Prykhodko
034832ddbe UI: Refactoring alarm rule 2023-02-02 15:25:04 +02:00
ViacheslavKlimov
ae709351ce UI for alarm comment notification rule trigger 2023-02-01 20:00:47 +02:00
Volodymyr Babak
d534fb31e1 Updated filter types - add possibility to select multiple subtypes 2023-02-01 17:21:04 +02:00
Vladyslav_Prykhodko
15b0366482 UI: Refactoring notification rules 2023-02-01 15:58:00 +02:00
Vladyslav_Prykhodko
d44d697dd2 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-02-01 12:39:22 +02:00
Vladyslav_Prykhodko
ef2d808e70 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-02-01 12:38:59 +02:00
Vladyslav
d8860efe6a
Merge pull request #8022 from ArtemDzhereleiko/AD/notification/rule
Notification rule
2023-02-01 11:26:43 +02:00
Vladyslav_Prykhodko
1b3c651d33 Merge 2023-02-01 11:04:17 +02:00
Artem Dzhereleiko
e9afa032b8 Merge remote-tracking branch 'upstream/feature/notification-system' into AD/notification/rule 2023-02-01 02:03:17 +02:00