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

5785 Commits

Author SHA1 Message Date
Andrii Shvaika
b869f39722 Merge branch 'master' into develop/3.5.1 2023-05-18 12:14:22 +03:00
YevhenBondarenko
bdbc04e800 merge with develop/3.5.1 2023-05-18 11:04:05 +02:00
YevhenBondarenko
e3b9099bb1 fixed cookie deserialization vulnerability 2023-05-17 20:46:59 +02:00
ShvaykaD
21e5a1a130 added logic update to the rule nodes upgrade script 2023-05-17 18:03:35 +03:00
dashevchenko
d966367623 fixed tests 2023-05-17 17:07:32 +03:00
Andrew Shvayka
a050422090
Merge pull request #8560 from smatvienko-tb/hotfix/alarm_repository_fix_This_statement_does_not_declare_an_OUT_parameter 
[hotfix][3.5.0] alarm repository fix this statement does not declare an out parameter
 2023-05-17 16:33:03 +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
ViacheslavKlimov
2483c89055 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 2023-05-17 12:28:24 +03:00
Sergey Matvienko
66ac54e5f6 exposed env SPRING_DATASOURCE_HIKARI_LEAK_DETECTION_THRESHOLD 2023-05-17 10:33:41 +02:00
Igor Kulikov
600d6cf27c UI: Widget config improvements 2023-05-16 20:00:53 +03:00
ViacheslavKlimov
c572f6d278 Check msg originator in DeviceActivityTriggerProcessor 2023-05-16 16:32:37 +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
AndriiD
f95c64591e fixed pr comments 2023-05-15 11:52:05 +03:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
Igor Kulikov
0beb2d7033 Merge branch 'master' into develop/3.5.1 2023-05-12 15:43:22 +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
Andrii Shvaika
c8d28ed672 No snapshot versions for edge 2023-05-10 14:41:34 +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
Igor Kulikov
f09fc8e735 Update ui help url 2023-05-09 11:20:01 +03:00
Andrii Shvaika
43674b7f29 Ignore a flaky test that is based on wrong cache strategy 2023-05-08 18:45:56 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
YevhenBondarenko
f1876456ca moved views and functions to a separate file 2023-05-08 13:47:57 +02:00
AndriiD
15d8b8ce91 Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 2023-05-08 13:07:32 +03:00
ViacheslavKlimov
ead9d3be70 Merge with develop/3.5.1 2023-05-08 12:54:07 +03:00
Andrew Shvayka
1a4eb3cf64
Merge pull request #8487 from YevhenBondarenko/fix/singleton-node 
fixed singleton mode update
 2023-05-08 12:17:12 +03:00
YevhenBondarenko
d3bc69f652 fixed singleton mode update 2023-05-04 16:56:56 +02:00
AndriiD
93c219c83e renamed base controller/service tests 2023-05-04 16:43:13 +03:00
Andrii Landiak
cc7564f137 Fix java cacerts path file separator for thingsboard.yml config 2023-05-04 16:16:55 +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
AndriiD
0e84fc1c6a removed redundant tests 2023-05-04 12:35:53 +03:00
ViacheslavKlimov
6c8f3c19de Active devices count to debug 2023-05-03 16:32:33 +03:00
ViacheslavKlimov
36743eb5af Branch name validation 2023-05-03 16:31:31 +03:00
Andrii Shvaika
9d217608b2 Merge branch 'fix/devices-activity-stats' 2023-05-03 15:22:04 +03:00
Andrii Shvaika
c87b993262 Change default parameters for active device counts 2023-05-03 14:25:53 +03:00
Andrii Shvaika
08835a7245 Improvements to the activity stats reporting 2023-05-03 14:23:54 +03:00
Dmytro Skarzhynets
b612ab2f92 Fix: fix integration tests 2023-05-03 14:06:56 +03:00
Dmytro Skarzhynets
69857cb478 Fix: move upgrade system data log to correct place 2023-05-03 13:39:21 +03:00
Dmytro Skarzhynets
c607589655 Fix: move enrichment nodes upgrade script to 3.5.1 version 2023-05-03 13:14:43 +03:00
ViacheslavKlimov
5f7ff55f01 Performance improvements for usage stats 2023-05-03 13:11:09 +03:00
YevhenBondarenko
0ae1be3aa5 kv validator improvements 2023-05-03 11:44:59 +02:00
Andrew Shvayka
ccd9af264c
Merge pull request #8463 from YevhenBondarenko/import-improvements 
optimize imports
 2023-05-02 17:33:11 +03:00
ShvaykaD
6266f6763e merge with develop/3.5 2023-05-02 16:15:15 +03:00
Andrew Shvayka
15ce59b64f
Merge pull request #8449 from YevhenBondarenko/fix/device-state 
fixed using default timeout and improvements
 2023-05-02 13:28:41 +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