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

397 Commits

Author SHA1 Message Date
Andrii Shvaika
1de437b1e6 Merge with develop/3.5.2 2023-05-25 12:25:51 +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
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
ShvaykaD
f0bf244f34 merge with develop/3.5.1 2023-05-19 17:23:28 +03:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil 
[3.5.1]Replace object mapper usages with jackson utils
 2023-05-19 17:07:16 +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
ShvaykaD
cfcf539c50 added upgrade logic tests && added fixes for review comments 2023-05-18 18:55:00 +03:00
ShvaykaD
21e5a1a130 added logic update to the rule nodes upgrade script 2023-05-17 18:03:35 +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
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
ShvaykaD
fb164f0e24 merge with develop 3.5.1 2023-05-10 14:22:24 +03:00
AndriiD
7187fbb4d3 Replace object mapper usages with jackson utils 2023-05-10 14:10:58 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
AndriiD
32e5d8561b Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
 2023-05-04 14:35:41 +03:00
ShvaykaD
6266f6763e merge with develop/3.5 2023-05-02 16:15:15 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
Andrew Shvayka
d03f236263
Merge pull request #8440 from thingsboard/improvements/notification-system 
Improvements for notification system
 2023-05-01 12:43:48 +03:00
AndriiD
73833a666b Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
 2023-04-28 15:08:44 +03:00
ViacheslavKlimov
c542bb9b16 Notification system API description for Swagger 2023-04-27 13:55:16 +03:00
Igor Kulikov
a736f177ef Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-26 18:08:13 +03:00
Andrew Shvayka
abd843b6f5
Merge pull request #8423 from thingsboard/improvements/notification-system 
Fixes for notification system
 2023-04-25 18:03:15 +03:00
ViacheslavKlimov
f44de42165 Available delivery methods check: don't check mail server connection 2023-04-25 14:31:09 +03:00
ViacheslavKlimov
b71257ba23 User title template param, improve notification preview, improve default notifications 2023-04-24 15:47:00 +03:00
YevhenBondarenko
da0bd1dc92 renamed SingletonSupport to ClusteringMode and refactoring due to comments 2023-04-24 13:49:57 +02:00
Igor Kulikov
14c61f65e9 UI: Alarm count datasource type support. Improve alarm filters. 2023-04-21 18:00:56 +03:00
YevhenBondarenko
3261cf4fe3 implemented rule node singleton mode 2023-04-20 16:07:14 +02:00
AndriiD
dd9c055ecf replace_ObjectMapper_usages_with_JacksonUtil 2023-04-14 11:58:24 +03:00
ShvaykaD
af06197f90 Merge branch 'develop/3.5' of github.com:ShvaykaD/thingsboard into feature/enrichment-rule-nodes-improvements 2023-04-14 11:16:04 +03:00
ViacheslavKlimov
bbaf2a5054 Notification rule trigger via ClusterService 2023-04-04 12:58:47 +03:00
ViacheslavKlimov
cd50eabd40 Notification rule node; refactoring 2023-04-03 19:02:23 +03:00
ShvaykaD
f16188ae58 refactoring rule nodes after review 2023-03-30 16:27:17 +03:00
Dmytro Skarzhynets
c3d365b184 Merge with ShvaykaD remote 2023-03-28 16:58:49 +03:00
ViacheslavKlimov
c4827f20f3 API usage limit notification rule 2023-03-28 13:29:49 +03:00
YevhenBondarenko
b53f656f72 added notification entities to the TenantIdLoader 2023-03-23 23:39:57 +01:00
ViacheslavKlimov
4ea97e6f30 Configured notification delivery methods check 2023-03-23 15:10:18 +02:00
Dmytro Skarzhynets
af18ec1953 Merge remote-tracking branch 'upstream/develop/3.5' into feature/enrichment-rule-nodes-improvements 
# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
 2023-03-23 12:48:04 +02:00
Dmytro Skarzhynets
f29e1f5fef Add fetch to logic, fix and add tests for some rule nodes 2023-03-23 12:44:23 +02:00
ViacheslavKlimov
0308b0128d Entities limit notifications 2023-03-20 17:33:34 +02:00
ViacheslavKlimov
ba8f27fa76 Notification system refactoring and improvements 2023-03-15 12:32:23 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrii Shvaika
69b5a5f425 Alarm Service refactoring 2023-02-23 19:03:04 +02:00
Andrii Shvaika
c922bbb989 Alarm service refactroing 2023-02-23 12:31:07 +02:00
Andrii Shvaika
c16dfd4407 Alarm query updates 2023-02-17 16:15:17 +02:00
Andrii Shvaika
04eb8c989a Revert the AlarmInfo items. We will update the assignee via separate message 2023-02-16 18:47:51 +02:00
Vladyslav_Prykhodko
3eba03cccc Fixed after merge 'upstream/develop/3.5' 2023-02-14 11:39:29 +02:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
zbeacon
26a9f10109 Updated alarm websocket subscriptions 2023-01-31 18:41:41 +02:00
Vladyslav_Prykhodko
8174a97926 Merge with klimov/feature/notification-system 2023-01-31 17:46:12 +02:00