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

828 Commits

Author SHA1 Message Date
ViacheslavKlimov
014497cd89 User-level notification settings 2023-06-20 12:04:48 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-13 13:49:51 +03:00
Andrew Shvayka
7d31d25aa0
Merge pull request #8729 from thingsboard/fixes/notification-system 
Notifications deduplication improvements
 2023-06-13 12:25:07 +03:00
Andrii Shvaika
997b915905 Merge with develop/3.5.2 2023-06-13 11:30:29 +03:00
ViacheslavKlimov
39d7498c59 Merge branch 'develop/3.5.2' into fixes/notification-system 2023-06-12 21:37:21 +03:00
ViacheslavKlimov
b77078c24e Notifications deduplication improvements 2023-06-08 18:15:56 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
YevhenBondarenko
7f9a9c7fb3 merge with develop/3.6 2023-06-05 15:58:16 +02:00
YevhenBondarenko
db6f310284 migration to spring boot 3.1 2023-06-05 15:24:47 +02:00
ViacheslavKlimov
2f560315d1 Exceeded rate limits notifications; their deduplication; refactoring 2023-06-02 15:09:09 +03:00
Andrii Shvaika
da90c21b6c Merge with develop/3.5.2. Version set to 3.6.0-SNAPSHOT 2023-05-29 13:45:17 +03:00
Andrii Shvaika
2a1259570b Temporary version set to 3.5.2-SNAPSHOT to merge 2023-05-29 13:43:10 +03:00
Andrii Shvaika
adcf23cabb Improved the procedure of rule node update 2023-05-25 17:13:59 +03:00
imbeacon
dc483ee0a2 Changed method for removing relations from all to removing only COMMON relations 2023-05-25 13:16:43 +03:00
Andrii Shvaika
1de437b1e6 Merge with develop/3.5.2 2023-05-25 12:25:51 +03:00
ViacheslavKlimov
508a990ab1 Merge remote-tracking branch 'origin/develop/3.5.2' into feature/notification-configs-vc 2023-05-23 15:20:21 +03:00
dashevchenko
f489e934b1 renamed variables 2023-05-23 15:02:33 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
YevhenBondarenko
b5bce3e187 merge with develop/3.5.1 2023-05-19 19:03:11 +02:00
dashevchenko
7e7b5b17e7 refactoring 2023-05-19 17:32:17 +03:00
ShvaykaD
f0bf244f34 merge with develop/3.5.1 2023-05-19 17:23:28 +03:00
Viacheslav Klimov
e3646c9ea9
Merge branch 'develop/3.5.1' into feature/notification-configs-vc 2023-05-19 15:40:48 +02:00
Vladyslav_Prykhodko
31858ea48e Merge remote-tracking branch 'upstream/develop/3.5.1' into feature/notification-rules-disabling 2023-05-19 13:51:57 +03:00
ShvaykaD
b8eb239c39 Merge branch 'develop/3.5.1' of github.com:thingsboard/thingsboard into feature/enrichment-rule-nodes-improvements 2023-05-18 18:57:26 +03:00
dashevchenko
49c230c815 refactoring 2023-05-18 17:58:45 +03:00
ShvaykaD
21e5a1a130 added logic update to the rule nodes upgrade script 2023-05-17 18:03:35 +03:00
dashevchenko
b083ab98e0 updated GET /resources api to filter resources by type 2023-05-17 15:10:57 +03:00
ShvaykaD
5831876b8e added upgrade script logic for all enrichment rule nodes && additional improvements to TbGetRelatedAttributeNode 2023-05-16 15:57:30 +03:00
YevhenBondarenko
6fda898851 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6 2023-05-15 12:09:22 +02:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
ViacheslavKlimov
b7f19a12cf Version control for notification configs 2023-05-12 14:54:14 +03:00
ViacheslavKlimov
5cec1b8af2 Ability to disable notification rule 2023-05-11 14:57:40 +03:00
Andrew Shvayka
86743b907a
Merge pull request #8464 from thingsboard/improvements/notification-system 
Notifications deduplication; upgrade improvements
 2023-05-04 12:47:03 +03:00
ViacheslavKlimov
c39e8568ae Upgrade improvements for notification system 2023-05-02 12:46:50 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
Andrii Shvaika
dcbc4c5c7d Device Info Filter 2023-04-27 19:09:56 +03:00
YevhenBondarenko
4977108550 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.6 2023-04-21 19:34:31 +02:00
Igor Kulikov
14c61f65e9 UI: Alarm count datasource type support. Improve alarm filters. 2023-04-21 18:00:56 +03:00
Andrii Landiak
fbeb56cf70 Refactor after review and add tests for extracting by regex 2023-04-12 17:50:26 +03:00
Andrii Shvaika
5d84945ccd Review and improvements 2023-04-12 14:06:38 +03:00
Andrii Shvaika
4cea4362dc Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning 2023-04-12 12:47:41 +03:00
Andrii Shvaika
166afbd782 Merge branch 'develop/3.5' into develop/3.6 2023-04-07 15:41:24 +03:00
Andrew Shvayka
8769911694
Merge pull request #8256 from imbeacon/fix/alarm-assignment-user-issues 
Added getting user list for alarm assignment and ability to assign alarms for customer users
 2023-04-07 15:00:22 +03:00
Andrii Landiak
e7fc00e53d Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-04-07 13:42:00 +03:00
Andrii Landiak
55adb3d12a Refactor x509: add logic of rotating x509 credentials and creating new device to DeviceProvisionService 2023-04-07 13:07:08 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +03:00
Andrii Shvaika
d71307402e Merge with develop/3.5 2023-04-06 11:43:34 +03:00