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

3055 Commits

Author SHA1 Message Date
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
Artem Dzhereleiko
8a02f3643c UI: Refactoring value change to destroy 2023-02-08 15:50:57 +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
devaskim
96911590e1 Leave only lower bould for widget's height in mobile mode. 2023-02-08 11:06:01 +05: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
Vladyslav_Prykhodko
6ac0024944 UI: Add notification setting 2023-02-07 16:42:36 +02:00
Igor Kulikov
5102f04bfb
Merge pull request #8037 from ChantsovaEkaterina/bug/other-modules-not-included-when-loading-resource-as-module 
Fix loading widget resources, when one of the resources is marked as module
 2023-02-07 15:53:44 +02:00
Igor Kulikov
88a055fa2b
Merge pull request #8031 from ArtemDzhereleiko/AD/bug-fix/path-device-profiles 
Hotfix device profile url for navigation cards settings
 2023-02-07 15:49:26 +02:00
Vladyslav_Prykhodko
ed2604a099 UI: Fixed incorrect resolve state entity 2023-02-07 15:44:21 +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
Chantsova Ekaterina
c5e6f0830b UI: fix loading widget resources, when one of the resources is marked as module 2023-02-03 16:00:37 +02:00
Igor Kulikov
3aed9db82f UI: Angular 14 migration 2023-02-02 16:55:27 +02:00
Igor Kulikov
28a48c3fc5 UI: Angular 14 migration 2023-02-02 16:09:49 +02:00
Igor Kulikov
1b51b38466 UI: Angular 14 migration 2023-02-02 16:08:41 +02:00
Igor Kulikov
21cd557d96 UI: Angular 14 migration 2023-02-02 15:55:06 +02:00
Igor Kulikov
ca2e0df8d7 UI: Angular 14 migration 2023-02-02 15:51:53 +02:00
Igor Kulikov
cd96b29516 UI: Angular 14 migration 2023-02-02 15:49:59 +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
Artem Dzhereleiko
d5e6f1bf73 UI: Fixed device profile url 2023-02-02 14:26:56 +02:00
ViacheslavKlimov
ae709351ce UI for alarm comment notification rule trigger 2023-02-01 20:00:47 +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
Artem Dzhereleiko
9fcd7a7ed8 UI: Refactoring 2023-02-01 11:20: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
29c1c57413 UI: Notification request setting scheduler for later 2023-01-31 18:18:55 +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
Artem Dzhereleiko
72ab2ad649 Merge remote-tracking branch 'upstream/feature/notification-system' into AD/notification/rule 2023-01-31 13:37:41 +02:00
Vladyslav_Prykhodko
e3057ffe24 UI: Change notification recipients models 2023-01-31 13:35:16 +02:00
Artem Dzhereleiko
077cc3782c UI: update and resolve conflict 2023-01-31 11:45:07 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
devaskim
c7448c60e2 Add quarter and half year intervals to time window. 2023-01-31 13:29:24 +05:00