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

12509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Shvaika
59b3e62e3a Correct rule node names 2023-02-02 19:20:53 +02:00
Igor Kulikov
3aed9db82f UI: Angular 14 migration 2023-02-02 16:55:27 +02:00
Igor Kulikov
93cfc88f58 UI: Angular 14 migration 2023-02-02 16:38:18 +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
5a12525c18 UI: Angular 14 migration 2023-02-02 15:57:18 +02:00
Igor Kulikov
a5b17b6c38 UI: Angular 14 migration 2023-02-02 15:56:12 +02:00
Igor Kulikov
21cd557d96 UI: Angular 14 migration 2023-02-02 15:55:06 +02:00
Igor Kulikov
4bdc4de86c UI: Angular 14 migration 2023-02-02 15:53:46 +02:00
Igor Kulikov
ca2e0df8d7 UI: Angular 14 migration 2023-02-02 15:51:53 +02:00
Igor Kulikov
c2edd210ee UI: Angular 14 migration 2023-02-02 15:51:15 +02:00
Igor Kulikov
cd96b29516 UI: Angular 14 migration 2023-02-02 15:49:59 +02:00
Igor Kulikov
13de52a171 UI: Angular 14 migration 2023-02-02 15:48:36 +02:00
Igor Kulikov
7e3408f650 UI: Angular 14 migration 2023-02-02 15:45:47 +02:00
Igor Kulikov
c3efbfa06a Update gitignore 2023-02-02 15:44:44 +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
bbaaa6b972 Tests for Rule Engine component lifecycle event notification rule; improvements 2023-02-02 14:15:54 +02:00
ViacheslavKlimov
ae709351ce UI for alarm comment notification rule trigger 2023-02-01 20:00:47 +02:00
ViacheslavKlimov
7d9fff4e44 New notification rule triggers: alarm comment and Rule Engine component lifecycle event; refactoring 2023-02-01 20:00:32 +02:00
Igor Kulikov
44a7fd5fc6 Merge branch 'master' into develop/3.5 2023-02-01 16:44:16 +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
Igor Kulikov
71f6456294 Transport tests timeout improvements 2023-02-01 12:55:11 +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
b112811546 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-01-31 13:35:45 +02:00
Vladyslav_Prykhodko
e3057ffe24 UI: Change notification recipients models 2023-01-31 13:35:16 +02:00
ViacheslavKlimov
63dbd1ef68 Refactor SlackNotificationTargetConfig 2023-01-31 13:19:39 +02:00
ViacheslavKlimov
789120e2c9 Notification rules: more tests, additionalConfig with description; refactor NotificationSettings 2023-01-31 13:12:14 +02:00
Artem Dzhereleiko
077cc3782c UI: update and resolve conflict 2023-01-31 11:45:07 +02:00
Igor Kulikov
feaeb24bf2 Update rule nodes UI 2023-01-31 11:09:21 +02:00
Igor Kulikov
55075d5541 Update UI help to release-3.4.4 2023-01-31 11:06:59 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
Igor Kulikov
2097f37a0b
Merge pull request #8013 from ChantsovaEkaterina/bug/error-on-loading-custom-widgets-module-within-state-component 
Fixed error on loading custom widgets module withing dashboard state component
 2023-01-31 10:10:24 +02:00
Igor Kulikov
dd981cd340
Merge pull request #8012 from ChantsovaEkaterina/bug/custom-translation-for-latest-keys-in-timeseries-not-applied 
Fixed applying custom translation to labels of latest data keys in timeseries widgets
 2023-01-31 10:09:27 +02:00