13158 Commits

Author SHA1 Message Date
ViacheslavKlimov
9a34218d1c Update notification templates help pages 2023-03-27 14:37:47 +03:00
ViacheslavKlimov
408eb0bc02 Refactor notification rules processing 2023-03-27 14:37:07 +03:00
Artem Dzhereleiko
cb0a166334 UI: Fix 2023-03-27 14:17:16 +03:00
Artem Dzhereleiko
3183881bde UI: Merge with dev-3.5 and resolve conflict 2023-03-27 14:08:37 +03:00
kalytka
e984ef4fae Refactoring 2023-03-27 14:02:48 +03:00
kalytka
78ffd10dd3 Changed labelText and reqiredText logic 2023-03-27 13:52:40 +03:00
Artem Dzhereleiko
1a0b756030 UI: Fixed stepper 2023-03-27 13:23:19 +03:00
Yevhen Bondarenko
d102e894a6
Merge pull request #8260 from thingsboard/feature/home-page
Feature/home page
2023-03-27 12:05:23 +02:00
Vladyslav_Prykhodko
2ed5784560 Merge branch 'duplicate_filter' of github.com:engix-ltd/thingsboard into engix-ltd-duplicate_filter 2023-03-27 13:00:42 +03:00
Artem Dzhereleiko
db3e0d6828 UI: Fixed widget bundle add button 2023-03-27 11:59:04 +03:00
Igor Kulikov
97278c9ef2 UI: Move send notification button router tabs panel. 2023-03-24 19:24:31 +02:00
YevhenBondarenko
43efbbe8b9 fixed testSystemInfoTimeSeriesWsCmd 2023-03-24 17:29:09 +01:00
Igor Kulikov
5f3e277ca1 UI: Reduce default buttons letterspacing 2023-03-24 17:59:43 +02:00
Andrii Shvaika
e5b661454e Merge branch 'feature/home-page' of github.com:YevhenBondarenko/thingsboard into feature/home-page 2023-03-24 17:25:52 +02:00
Andrew Shvayka
48508ce7f5
Merge pull request #7911 from thingsboard/feature/notification-system
[3.5] Notification system
2023-03-24 17:17:48 +02:00
Vladyslav_Prykhodko
f1fb7d631e UI: Fixed ws in notification 2023-03-24 16:59:51 +02:00
YevhenBondarenko
af13292b4b Merge remote-tracking branch 'vklimov/feature/notification-system' into feature/notification-system 2023-03-24 14:24:12 +01:00
ViacheslavKlimov
54f9240c08 Fix tests 2023-03-24 15:21:57 +02:00
Vladyslav_Prykhodko
b8c1085c62 Set new URL for ruleChains 2023-03-24 13:43:27 +02:00
Vladyslav_Prykhodko
eea6e5a5e6 Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-24 13:42:44 +02:00
YevhenBondarenko
25e7b354ff Merge remote-tracking branch 'vklimov/feature/notification-system' into feature/notification-system 2023-03-24 12:24:07 +01:00
Igor Kulikov
5d54716ec6
Merge pull request #8062 from ArtemDzhereleiko/AD/refactoring/timewindow
Refactoring time window component
2023-03-24 13:23:24 +02:00
ViacheslavKlimov
4673e812b0 Fix notification system tests 2023-03-24 13:21:25 +02:00
Igor Kulikov
b21c7ad1d2
Merge pull request #8258 from vvlladd28/improvemen/menu/ruleChains
Move rule chains menu link in top level
2023-03-24 13:19:32 +02:00
Vladyslav_Prykhodko
4ae7cd81c4 UI: Move rule chains menu link in top level 2023-03-24 12:41:06 +02:00
Andrew Shvayka
c1539b24c2
Merge pull request #8257 from ShvaykaD/bugfix/sql/remove-ts-partitions-by-ttl
[3.5] fix logic in procedure for drop ts_kv partitions by ttl
2023-03-24 12:40:56 +02:00
ShvaykaD
07de3ef7fd fix logic in procedure for drop ts_kv partitions by ttl 2023-03-24 12:26:25 +02:00
Andrew Shvayka
0b0fb2e6e5
Merge pull request #8253 from adovh/bug/fix-alarm-assignment-check-user-id
[3.5] added assignee check for alarm
2023-03-24 11:52:26 +02:00
YevhenBondarenko
b53f656f72 added notification entities to the TenantIdLoader 2023-03-23 23:39:57 +01:00
YevhenBondarenko
0101f6fc90 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-23 22:14:45 +01:00
YevhenBondarenko
a35b3cd6ad System info improvements 2023-03-23 21:54:14 +01:00
ViacheslavKlimov
197207035b Notification system fixes, new notification targets 2023-03-23 18:27:45 +02:00
Vladyslav_Prykhodko
b10e162b19 UI: Add new notification recipient types 2023-03-23 18:10:37 +02:00
Vladyslav_Prykhodko
604e591274 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-23 17:42:28 +02:00
Vladyslav_Prykhodko
2f3a1d0741 UI: Add in notification review list recipients 2023-03-23 17:42:04 +02:00
Andrii Shvaika
9fd578cb91 Notification Templates help 2023-03-23 17:36:40 +02:00
YevhenBondarenko
37a5aeb485 implemented features info 2023-03-23 16:34:51 +01:00
kalytka
9e2d2e980c Added "delete" icon to the default icon list 2023-03-23 17:21:57 +02:00
Vladyslav_Prykhodko
c6b519cab7 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-23 15:25:45 +02:00
ViacheslavKlimov
4ea97e6f30 Configured notification delivery methods check 2023-03-23 15:10:18 +02:00
YevhenBondarenko
32278beabc improvements due to comments 2023-03-23 13:56:36 +01:00
AndriiD
0788a89f54 added assignee check to controller 2023-03-23 14:07:35 +02:00
Vladyslav_Prykhodko
57390a9055 UI: Add help popup in notification template 2023-03-23 13:25:54 +02:00
ViacheslavKlimov
5e400726d3 Merge branch 'develop/3.5' into feature/notification-system 2023-03-23 12:36:08 +02:00
ViacheslavKlimov
3dc0ec5845 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-23 12:35:48 +02:00
ViacheslavKlimov
e32d626535 Improvements for default notification configs 2023-03-23 12:34:44 +02:00
Vladyslav_Prykhodko
53fb5ccbea Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-23 12:16:13 +02:00
Vladyslav_Prykhodko
7aaf0d361c UI: Minor change in notification 2023-03-23 12:15:29 +02:00
YevhenBondarenko
b6c3750f7a Merge remote-tracking branch 'vklimov/feature/notification-system' into feature/notification-system 2023-03-23 10:37:27 +01:00
Andrew Shvayka
bcd9ea3931
Merge pull request #8245 from YevhenBondarenko/fix/upgrade
[3.5]fixed upgrade schema update
2023-03-23 10:34:37 +02:00