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

848 Commits

Author SHA1 Message Date
ViacheslavKlimov
5c8d9e9f8d Merge branch 'develop/3.5' into improvements/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
 2023-03-30 12:14:53 +03:00
Igor Kulikov
a1bbd7ad0d
Merge pull request #8283 from engix-ltd/extend_timewindow_ranges 
Add quarter and half year intervals to time window.
 2023-03-29 11:49:58 +03:00
Vladyslav_Prykhodko
678bed6c4f UI: Notification add new rule API_USAGE_LIMIT 2023-03-28 16:51:43 +03:00
Vladyslav_Prykhodko
53dd3c89f4 UI: fix minnor bug in notification and change notification models 2023-03-28 13:47:24 +03:00
Andrii Landiak
1674223e63 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-28 12:01:41 +03:00
Vladyslav_Prykhodko
eea6e5a5e6 Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-24 13:42:44 +02:00
Vladyslav_Prykhodko
4ae7cd81c4 UI: Move rule chains menu link in top level 2023-03-24 12:41:06 +02:00
Vladyslav_Prykhodko
b10e162b19 UI: Add new notification recipient types 2023-03-23 18:10:37 +02:00
Vladyslav_Prykhodko
2f3a1d0741 UI: Add in notification review list recipients 2023-03-23 17:42:04 +02:00
Vladyslav_Prykhodko
57390a9055 UI: Add help popup in notification template 2023-03-23 13:25:54 +02:00
Vladyslav_Prykhodko
7aaf0d361c UI: Minor change in notification 2023-03-23 12:15:29 +02:00
Vladyslav_Prykhodko
daa73dbf53 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-22 18:22:13 +02:00
Vladyslav_Prykhodko
894b992196 UI: Add allow delete notification and request notification 2023-03-22 17:08:10 +02:00
deaflynx
d3803f828d Device profile provision strategy -> fix patch values form for X509 Certificate Chain 2023-03-22 13:51:56 +02:00
deaflynx
0e019967e2 Feature X509 Device provision added ui form 2023-03-22 12:13:59 +02:00
Vladyslav_Prykhodko
d4547ade3d UI: Fixed after merge develop/3.5 2023-03-21 17:56:12 +02:00
Vladyslav_Prykhodko
1b2b84e48e Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-21 15:32:23 +02:00
Vladyslav_Prykhodko
ecdd49d672 UI: Add notification template and rule trigger config for entities limit 2023-03-21 15:03:30 +02:00
Vladyslav_Prykhodko
1610cc143b UI: Fix linter error in notification 2023-03-20 16:51:42 +02:00
Vladyslav_Prykhodko
5bcbf2dc6d UI: Add support hint for target type notification 2023-03-20 15:54:34 +02:00
Vladyslav_Prykhodko
d66d882a0c UI: Add new function in tenant profiles service 2023-03-20 15:07:28 +02:00
Vladyslav_Prykhodko
14b05a57bd UI: Add new notification template/rule RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT 2023-03-17 18:53:03 +02:00
Vladyslav_Prykhodko
615e4a2865 UI: Add new notiifcation target 2023-03-17 16:35:34 +02:00
Igor Kulikov
8d3278c355 Add tenantId to device and asset profile info objects 2023-03-17 14:21:27 +02:00
Igor Kulikov
c03865e50b Add tenantId to device and asset profile info objects 2023-03-17 14:18:34 +02:00
Vladyslav_Prykhodko
ca2fac4b9d UI: Add new notification rule settings 2023-03-16 15:45:34 +02:00
Vladyslav_Prykhodko
c7dbf6be89 UI: Add new notification type alarm assignment 2023-03-15 18:39:06 +02:00
Vladyslav_Prykhodko
a39db0a1cf UI: Fix notification after change API 2023-03-15 13:28:31 +02:00
Vladyslav_Prykhodko
88128640e9 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-14 16:37:50 +02:00
Vladyslav_Prykhodko
c6230a48b8 UI: Fix notification after change API 2023-03-14 16:37:05 +02:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Vladyslav_Prykhodko
75e0f335b9 UI: Change notification style and send notification error 2023-03-10 18:23:25 +02:00
Igor Kulikov
926c364575 UI: Router tabs component improvements. Remove alarm rules page. 2023-03-10 14:58:16 +02:00
Igor Kulikov
0780669498 Merge with develop/3.5 2023-03-10 12:56:00 +02:00
Andrew Shvayka
20e4905e84
Merge pull request #8186 from thingsboard/feature/mqtt/sparkplug 
MQTT Sparkplug protocol support
 2023-03-10 12:45:59 +02:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Igor Kulikov
11f54d96fd UI: Improve default time window calculation 2023-03-08 16:02:04 +02:00
Igor Kulikov
3688c6aa44 UI: Improve default time window calculation 2023-03-08 15:45:39 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
rusikv
411da14083 Moved changed to optional assignee id in alarm query constructor to end 2023-03-07 18:30:58 +02:00
Volodymyr Babak
dc7e872b16 Fixed correct approach for deprecated ts field 2023-03-03 13:44:12 +02:00
Volodymyr Babak
c2b1a948da Removed check of deprecated entity alias filter type from backend to frontend 2023-03-03 10:17:42 +02:00
Andrii Shvaika
6b121514fc Merge with develop/3.5 2023-02-28 19:06:54 +02:00
rusikv
d5d2b043a2 Merge branch 'alarmCommentsUI' of github.com:rusikv/thingsboard into alarmCommentsUI 2023-02-24 16:23:16 +02:00
Vladyslav_Prykhodko
902cd73000 UI: Add support in web notification action open dashboard 2023-02-24 11:29:36 +02:00
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
Vladyslav_Prykhodko
8589047fcc UI: Refactoring web socket 2023-02-16 12:59:43 +02:00