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

1688 Commits

Author SHA1 Message Date
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
Igor Kulikov
e5a9dbc795 UI: Angular 15 migration 2023-02-17 19:24:01 +02:00
Igor Kulikov
55267a6a08 UI: Angular 15 migration 2023-02-17 12:39:08 +02:00
Igor Kulikov
f4f7e8f284 UI: Angular15 migration 2023-02-16 19:32:02 +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
f395d9b7fc UI: Refactoring component 2023-02-13 16:11:23 +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
6a0e8c03a4 Improvement date ago pipe 2023-02-09 14:36:11 +02:00
Vladyslav_Prykhodko
3bbf69c894 Improvement notification alarm style 2023-02-09 12:31:06 +02:00
Artem Dzhereleiko
dec459c196 UI: Refactoring overlay 2023-02-09 12:19:40 +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
Artem Dzhereleiko
97a94ef5a0 Merge remote-tracking branch 'upstream/develop/3.5' into AD/refactoring/timewindow 2023-02-08 13:43:49 +02:00
Artem Dzhereleiko
f2088ad53b UI: Refactoring 2023-02-08 11:02:29 +02:00
Andrii Shvaika
8bd9f2e29c Merge with release 3.4.4 2023-02-07 18:47:38 +02:00
Artem Dzhereleiko
17893201b6 Merge remote-tracking branch 'upstream/develop/3.5' into AD/form-components/refactoring 2023-02-07 18:13:00 +02:00
Artem Dzhereleiko
9d709bb58a UI: Refactoring timewindow component 2023-02-07 17:45:03 +02:00
Vladyslav_Prykhodko
b1a6264fd1 UI: Improvement notification web view 2023-02-07 17:31:01 +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
93fe447c47 UI: Set max time for scheduling notification 7 days 2023-02-01 16:25:07 +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
Artem Dzhereleiko
5d686b7dc6 UI: Notification rule 2023-02-01 02:02:27 +02:00
Vladyslav_Prykhodko
8174a97926 Merge with klimov/feature/notification-system 2023-01-31 17:46:12 +02:00
Vladyslav_Prykhodko
7549ec2804 UI: Add settings for new recipients type Slack 2023-01-31 17:06:55 +02:00
ViacheslavKlimov
68b0158f3e Remove duplicated type from NotificationTarget; new OriginatorEntityOwnerUsersFilter; refactoring 2023-01-31 16:46:35 +02:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
ViacheslavKlimov
9a7966d405 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-01-31 16:15:05 +02:00
ViacheslavKlimov
e44f03da42 Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system 
# Conflicts:
#	application/src/main/data/upgrade/3.4.3/schema_update.sql
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/resources/thingsboard.yml
#	dao/src/main/resources/sql/schema-entities-idx.sql
#	dao/src/main/resources/sql/schema-entities.sql
#	pom.xml
 2023-01-31 16:14:30 +02:00