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

774 Commits

Author SHA1 Message Date
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
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
Artem Dzhereleiko
7ea0c23c65 UI: Norification rule 2023-01-31 02:03:51 +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
Artem Dzhereleiko
1b1f3b4d7b UI: Add rule table 2023-01-23 14:54:15 +02:00
Vladyslav_Prykhodko
26c4303919 UI: Add customize notification web template 2023-01-20 18:08:30 +02:00
Vladyslav_Prykhodko
5dcd11cd82 UI: Add ws to show notification 2023-01-20 15:08:44 +02:00
zbeacon
2524965ea1 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-18 16:03:11 +02:00
Vladyslav_Prykhodko
25da40a1dc UI: Add new column in send notification table; improvement design send notification dialog 2023-01-18 13:03:37 +02:00
zbeacon
58f94460cc Changes due to commits 2023-01-18 08:51:37 +02:00
Vladyslav_Prykhodko
00d04aec3c UI: Add notification request and inbox table 2023-01-17 18:26:25 +02:00
Andrew Shvayka
5d08ef9289
Merge pull request #7914 from volodymyr-babak/edge/rule-chain-in-profiles 
[3.5] Added default edge rule chain to asset/device profiles
 2023-01-16 15:52:59 +02:00
Andrew Shvayka
3cf5fb1a0d
Merge pull request #7878 from volodymyr-babak/edge-install-instructions 
[3.5] Add edge install instructions for docker
 2023-01-16 15:49:30 +02:00
Volodymyr Babak
687cabdfcb Merge remote-tracking branch 'upstream/develop/3.5' into edge/rule-chain-in-profiles 2023-01-16 11:15:00 +02:00
zbeacon
5494bc7d2b Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-16 10:00:45 +02:00
rusikv
8e79d8f9a2 Alarm comments UI implementation, alarm details redesign 2023-01-15 13:14:48 +02:00
dashevchenko
e8d651a108 fixed audit logs 2023-01-12 18:42:47 +02:00
Vladyslav_Prykhodko
9fec151214 UI: Add notification template wizard 2023-01-12 18:11:37 +02:00
Vladyslav_Prykhodko
154aa30b4c UI: Refactoring notification center and added notification template 2023-01-12 12:38:03 +02:00
Artem Dzhereleiko
57f88960f7 UI: Added phone number to user profile 2023-01-11 17:29:07 +02:00
Vladyslav_Prykhodko
9051759ce8 UI: Add notification center and targets notification block 2023-01-06 19:28:12 +02:00
Volodymyr Babak
ab924d6e13 Added default edge rule chain to asset/device profiles. Added propagation of software id to edge 2023-01-05 18:05:56 +02:00
Volodymyr Babak
8f112f763f Merge branch 'develop/3.5' of github.com:volodymyr-babak/thingsboard into edge-install-instructions 2022-12-30 16:44:48 +02:00
Vladyslav_Prykhodko
f47005892d UI: Add notification service 2022-12-29 18:03:16 +02:00
Andrii Shvaika
831f11829c Merge with develop/3.5 2022-12-28 15:35:48 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
Vladyslav_Prykhodko
7d19d37a23 UI: Updated UI MQTT transport configuration models 2022-12-08 16:20:58 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
Volodymyr Babak
28bbb25aed Improved edge docker install instructions. Fixed incorrect JSON format error 2022-11-25 18:58:36 +02:00
Igor Kulikov
9830896893
Merge pull request #7658 from engix-ltd/hide_widget_in_desktop 
[3.4.2] UI: Make possible to hide widget in desktop mode.
 2022-11-23 12:15:02 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00