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

12528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Igor Kulikov
8a582cc79c Update rule nodes UI 2023-01-30 17:19:45 +02:00
Igor Kulikov
9ac8e43252
Merge pull request #8010 from ArtemDzhereleiko/AD/bug-fix/aggregation-index 
Fixed auto-indexing for keys with aggregation
 2023-01-30 17:03:25 +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
Vladyslav_Prykhodko
e9891b2bf0 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-01-30 16:12:20 +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
Andrew Shvayka
b22d31defc
Merge pull request #8002 from ShvaykaD/bugfix/entity-data-adapter-convert-value 
[3.4.4] Fix data convertion for BigInteger values that stored in DB as String
 2023-01-30 15:56:15 +02:00
Andrew Shvayka
9ff4a1d6e8
Merge pull request #8009 from ShvaykaD/bugfix/7998 
[3.4.4] rollback "tellFailure" logic change in TbAbstractGetAttributesNode
 2023-01-30 15:41:44 +02:00
ViacheslavKlimov
5cd82cfda3 Notification rule info; api to get targets by ids array 2023-01-30 15:39:20 +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
ShvaykaD
2b5e3269e2 fixed TbAbstractGetAttributesNode 2023-01-30 15:23:38 +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
Andrew Shvayka
45f05b4e3f
Merge pull request #7934 from Seraphym-Tuhai/UITests_AssetsProfiles 
[3.4.4]UI smoke tests on device and assets profiles
 2023-01-30 12:16:58 +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
Andrew Shvayka
ef94482196
Merge pull request #8000 from YuriyLytvynchuk/feature/node_deviceTypeSwitch 
[3.4.4] Feature: new nodes 'asset type switch' & 'device type switch'
 2023-01-27 14:34:33 +02:00
ShvaykaD
8060c6780d fix data convertion for BigInteger values(example: SIM, ICCID) that stored in DB as strings 2023-01-27 10:56:21 +02:00
Yuriy Lytvynchuk
1974843557 develop -> master 2023-01-27 09:46:16 +02:00
Yuriy Lytvynchuk
c88b402af8 new nodes: 
1. "asset type switch"
2. "device type switch"
 2023-01-27 09:43:37 +02:00
Andrew Shvayka
d121751701
Merge pull request #7995 from ShvaykaD/improvements/deduplication-rule-node 
[3.4.4] Deduplication rule node improvements
 2023-01-26 16:20:07 +02:00
Andrew Shvayka
fd01153209
Merge pull request #7997 from vvlladd28/improvement/ui-rule-node/deduplication 
Improvement UI rule node deduplication
 2023-01-26 16:18:37 +02:00
Vladyslav_Prykhodko
cad2ed4755 Improvement UI rule node deduplication 2023-01-26 15:55:36 +02:00