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

3196 Commits

Author SHA1 Message Date
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
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
Artem Dzhereleiko
7ea0c23c65 UI: Norification rule 2023-01-31 02:03:51 +02:00
Chantsova Ekaterina
1a4feb6804 UI: fixed error on loading custom widgets module withing dashboard state component 2023-01-30 19:03:41 +02:00
Chantsova Ekaterina
3255e48cac UI: fixed applying custom translation to labels of latest data keys in timeseries widgets 2023-01-30 17:30:29 +02:00
Igor Kulikov
3f7660f4a0
Merge pull request #7884 from wusung/feature/update-locale-zh_TW 
Update locale.constant-zh_TW.json
 2023-01-30 17:24:05 +02:00
Vladyslav_Prykhodko
00e9d2ce75 UI: Refactoring code 2023-01-30 16:35:19 +02:00
Vladyslav_Prykhodko
0fe0a84d32 Merge branch 'AD/bug-fix/aggregation-index' of github.com:ArtemDzhereleiko/thingsboard into AD/bug-fix/aggregation-index 2023-01-30 16:17:12 +02:00
Andrew Shvayka
e67afa3a8c
Merge pull request #7837 from ArtemDzhereleiko/AD/imp/ota-device-profile 
[3.5] Remove default device profile from OTA updates creation form
 2023-01-30 16:02:31 +02:00
Andrew Shvayka
b74fa21b60
Merge pull request #7951 from kalutkaz/queueAutocompleteHint 
Queue autocomplete add input hint
 2023-01-30 15:59:34 +02:00
Igor Kulikov
732a016e0c
Merge pull request #7903 from ArtemDzhereleiko/AD/bug-fix/gap-translation 
Hotfix added gap for widget setting mobile mod and fix translation
 2023-01-30 15:36:16 +02:00
Igor Kulikov
63f83e2f06
Merge pull request #7873 from vvlladd28/bug/search-field/null-value 
Fixed when deleting a value in the search field time shows null value
 2023-01-30 15:34:39 +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
Igor Kulikov
d9fb621d04 UI: Improve phone input component - to use text label and placeholder values instead of translation keys 2023-01-25 15:18:15 +02:00
Igor Kulikov
03d3999d36
Merge pull request #7875 from ArtemDzhereleiko/AD/bug-fix/phone-input-update 
Fix phone input update on save changes
 2023-01-25 15:14:14 +02:00
Artem Dzhereleiko
d82d6f3525 Merge and resolve conflict 2023-01-23 16:02:49 +02:00
Artem Dzhereleiko
9bd7462647 UI: Rename target to recipient 2023-01-23 15:03:31 +02:00
Artem Dzhereleiko
1b1f3b4d7b UI: Add rule table 2023-01-23 14:54:15 +02:00
Vladyslav_Prykhodko
25f2a54e5b UI: Add notification not in popover and added filter for noification template 2023-01-23 12:47:00 +02:00
Vladyslav_Prykhodko
26c4303919 UI: Add customize notification web template 2023-01-20 18:08:30 +02:00
Igor Kulikov
c58e214ec8 UI: Add tooltipster theme. 2023-01-20 17:03:46 +02:00
Vladyslav_Prykhodko
5dcd11cd82 UI: Add ws to show notification 2023-01-20 15:08:44 +02:00
Igor Kulikov
1ac8bd458d UI: Add MillisecondsToTimeStringPipe to widget context. Markdown widget: Add widget context argument to markdown text function. 2023-01-20 13:56:20 +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
Igor Kulikov
9bb4497f58 UI: Improve image map position conversion function 2023-01-17 18:33:50 +02:00
Vladyslav_Prykhodko
00d04aec3c UI: Add notification request and inbox table 2023-01-17 18:26:25 +02:00
Igor Kulikov
7a97fde048 UI: Fix map widget initial draggable mode. 2023-01-17 10:45:15 +02:00