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

5435 Commits

Author SHA1 Message Date
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
e8ba135f70 Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 16:20:34 +03:00
Igor Kulikov
f1db4c44c3 Merge branch 'master' into develop/3.5.1 2023-05-22 15:50:52 +03:00
Andrii Shvaika
c0b0c7ac5d Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 15:27:47 +03:00
Andrew Shvayka
7e1d06b3cd
Merge pull request #8456 from thingsboard/improvements/rate-limits 
Rate limits improvements
 2023-05-22 15:25:30 +03:00
Andrii Shvaika
916d5d80b5 Fix 3.5.1 update script location 2023-05-22 13:27:58 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
Andrew Shvayka
c48510407d
Merge pull request #8575 from YevhenBondarenko/feature/swagger-enabled 
added ability to disable swagger
 2023-05-19 17:09:46 +03:00
Andrew Shvayka
263b3132bc
Merge pull request #8573 from YevhenBondarenko/refactoring/table-name-constant 
table name constants refactoring
 2023-05-19 17:09:22 +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
Andrii Shvaika
7d3e7ef11f Skip DB Version check during upgrade based on env variable SKIP_SCHEMA_VERSION_CHECK 2023-05-19 16:35:57 +03:00
ViacheslavKlimov
3cdd293173 Merge with develop/3.5.1 2023-05-19 14:21:21 +03:00
ViacheslavKlimov
b163fb8e2d Upgrade from 3.5.0 2023-05-19 13:58:55 +03: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
YevhenBondarenko
ef735934f2 added ability to disable swagger 2023-05-18 22:25:33 +02:00
YevhenBondarenko
57674888ca table name constants refactoring 2023-05-18 17:29:29 +02:00
Andrew Shvayka
52a31dffc5
Merge pull request #8565 from YevhenBondarenko/fix/oauth-exploit-vulnerability 
fixed cookie deserialization vulnerability
 2023-05-18 12:21:57 +03:00
Andrew Shvayka
6a802c5784
Merge pull request #8429 from YevhenBondarenko/improvements-widgets-bundle 
added logs for widgets bundle
 2023-05-18 12:21:34 +03:00
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
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
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
ViacheslavKlimov
c572f6d278 Check msg originator in DeviceActivityTriggerProcessor 2023-05-16 16:32:37 +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
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
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