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

12368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav_Prykhodko
6ac0024944 UI: Add notification setting 2023-02-07 16:42:36 +02:00
Vladyslav
73472753d0
Merge pull request #8046 from ArtemDzhereleiko/AD/notification/template 
Notification temaplate
 2023-02-07 12:40:17 +02:00
Artem Dzhereleiko
cc832762bb UI: Add notification template 2023-02-06 13:31:00 +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
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
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
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
Artem Dzhereleiko
7ea0c23c65 UI: Norification rule 2023-01-31 02:03:51 +02:00
Vladyslav_Prykhodko
e9891b2bf0 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-01-30 16:12:20 +02:00
ViacheslavKlimov
5cd82cfda3 Notification rule info; api to get targets by ids array 2023-01-30 15:39:20 +02:00
Vladyslav_Prykhodko
8b2ee4b413 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-01-30 14:52:50 +02:00
ViacheslavKlimov
be5eed96dc Slack notification target; refactoring 2023-01-30 14:50:44 +02:00
Vladyslav_Prykhodko
ac9b3303b6 UI: Add copy/edit notification template and notify again 2023-01-30 10:23:36 +02:00
Artem Dzhereleiko
0e83c8ac74 Merge and resolve conflict 2023-01-27 15:58:24 +02:00
Vladyslav_Prykhodko
ebb5c634a3 UI: revert user settings 2023-01-27 15:48:18 +02:00
Artem Dzhereleiko
c3cc342393 UI: Add rule notification 2023-01-27 15:47:08 +02:00
Vladyslav_Prykhodko
9e35f4bd0f UI: Add settings for slack delivery method in notification template 2023-01-26 13:36:55 +02:00
Andrew Shvayka
2d587f500b
Merge pull request #7974 from YuriyLytvynchuk/feature/node_device_type_switch 
[3.5] Feature: new nodes 'asset type switch' & 'device type switch'
 2023-01-24 16:00:38 +02:00
Andrew Shvayka
45e93cfc79
Merge pull request #7982 from volodymyr-babak/edge/processors-refactoring 
[3.5] Edge processors refactoring - move common part of edge / server to base classes
 2023-01-24 15:56:36 +02:00
Volodymyr Babak
9ee2a40735 Speed up edge controller test by introducing executor and futures approach 2023-01-24 15:55:59 +02:00
Volodymyr Babak
08114319eb DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and set as deprecated 2023-01-24 12:56:20 +02:00
Volodymyr Babak
ecd1fa1981 Replace RandomStringUtils by StringUtils 2023-01-24 11:27:32 +02:00
Volodymyr Babak
f7db1d6612 Revert deprecated enum 2023-01-23 17:03:41 +02:00
Volodymyr Babak
e7e8ce1e26 Fixed warn message in case device with name already exists 2023-01-23 16:16:57 +02:00
Volodymyr Babak
8bea1016a3 Move saveOrCreateDevice to base device processor class 2023-01-23 16:13:35 +02:00
Artem Dzhereleiko
d82d6f3525 Merge and resolve conflict 2023-01-23 16:02:49 +02:00
Yuriy Lytvynchuk
9b05f7adf1 code review #2 2023-01-23 15:48:21 +02:00
Vladyslav
1503ae9649
Merge pull request #7980 from ArtemDzhereleiko/AD/notification/rename-target 
Notification center: Rename target to recipient
 2023-01-23 15:09:44 +02:00