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

3187 Commits

Author SHA1 Message Date
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
Andrew Shvayka
27c88e914d
Merge pull request #8556 from dashevchenko/smsDisabledFlag 
Added feature to disable sms messaging
 2023-05-19 16:51:43 +03:00
dashevchenko
9ef6501225 refactoring 2023-05-19 16:47:34 +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
ViacheslavKlimov
ce83ee4444 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
 2023-05-17 12:28:51 +03:00
dashevchenko
f28dd12bab fixed NPE 2023-05-16 16:47:05 +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
dashevchenko
a6c52809cd added sms disabled feature for tenant profile configuration 2023-05-16 15:04:39 +03: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
YevhenBondarenko
c9fb23e105 SystemUtil improvements 2023-05-10 17:53:50 +02:00
YevhenBondarenko
bcd2b94156 fixed start for windows 2023-05-10 17:18:45 +02: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
ViacheslavKlimov
ead9d3be70 Merge with develop/3.5.1 2023-05-08 12:54:07 +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
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
36743eb5af Branch name validation 2023-05-03 16:31:31 +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
ViacheslavKlimov
a4281fd6d3 Deduplication for new platform version notification 2023-05-01 19:28:11 +03:00
Igor Kulikov
44cf98de0e Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-01 15:42:06 +03:00
Igor Kulikov
1f334d58ad Introduce SystemParams object holding necessary UI system parameters 2023-05-01 15:41:55 +03:00
Andrii Shvaika
aceeab8544 Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-01 13:36:43 +03:00
Andrii Shvaika
6bf957cc5b Merge branch 'feature/sparkplug-shared-attributes' 2023-05-01 13:18:45 +03: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
Andrii Shvaika
89efe12c45 Fix Equals And HashCode issue for Device/Asset/EntityView Info 2023-04-28 17:09:01 +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
bf7454ad3c Move rate limiting to one service 2023-04-28 14:28:16 +03:00
Andrii Shvaika
7a385e34d1 DeviceInfo for Edge support 2023-04-28 14:27:17 +03:00
Andrii Shvaika
dcbc4c5c7d Device Info Filter 2023-04-27 19:09:56 +03:00
Andrii Shvaika
8e20fd8800 Metric wildcards and default attributes 2023-04-27 17:08:34 +03:00
ViacheslavKlimov
c542bb9b16 Notification system API description for Swagger 2023-04-27 13:55:16 +03:00
Andrii Shvaika
2278d98824 Merge remote-tracking branch 'origin/develop/3.5' into feature/sparkplug-shared-attributes 2023-04-27 11:30:19 +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
Andrii Shvaika
a405999a88 Use shared attributes for sparkplug devices 2023-04-25 19:03:17 +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
Andrew Shvayka
4dd5280191
Merge pull request #8414 from thingsboard/feature/singleton-rule-node 
Feature/singleton rule node
 2023-04-25 14:34:08 +03:00
YevhenBondarenko
dba203037f Added short doc for component clustering and added upgrade for mqtt node 2023-04-25 13:07:55 +02:00
Andrew Shvayka
64908e8d66
Merge pull request #8404 from imbeacon/feature/tbel-function-toFlatMap 
Feature TBEL function toFlatMap
 2023-04-25 12:58:23 +03:00
ViacheslavKlimov
0ce243f2e7 Merge with develop/3.5 2023-04-25 12:26:25 +03:00
imbeacon
4d46bc1131 Added writing the key for arrays 2023-04-25 09:14:48 +03:00
ViacheslavKlimov
6013e19e54 Fix entity action notification 2023-04-24 18:15:18 +03:00