3990 Commits

Author SHA1 Message Date
Oleksandra Matviienko
0f4591529a Changes according to comments (without GetOtaPackageCallback test)
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-03-27 22:15:04 +01:00
Oleksandra Matviienko
d66dff3c6c In DeviceApiController reducing the number of error messages with stack trace
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-03-27 22:15:04 +01:00
dashevchenko
6c911637ae merged with master 2024-03-27 19:04:34 +02:00
Volodymyr Babak
cb9236ff78
Merge pull request #10239 from AndriiLandiak/feature/edge-oauth-support
Edge - OAuth2 support
2024-03-27 14:52:01 +02:00
dashevchenko
4a151d5a2d
Merge branch 'master' into pubsubPrefixFix 2024-03-27 13:13:49 +02:00
dashevchenko
1f1a9c5a25 updated asset/device delete methods to delete only alarms originated by entity 2024-03-27 13:06:03 +02:00
dashevchenko
a00c0a3d7f Merge remote-tracking branch 'upstream/master' into sortProblemFix 2024-03-27 12:17:53 +02:00
ViacheslavKlimov
e1bac1bf79 Revert "Fix TbSubscriptionUtils order for matching KeyValueType and DataType"
This reverts commit d9669c9391146b402821f6fc872418ecbe0f3686.
2024-03-27 11:30:33 +02:00
Sergey Matvienko
b6ce95b99d NashornJsInvokeService: defaults added for max_memory and max_cpu_time to improve deployment experience 2024-03-27 09:03:47 +01:00
Sergey Matvienko
eba645c542 Nashorn LOCAL_JS_SANDBOX_MAX_MEMORY introduced 2024-03-26 19:25:44 +01:00
dashevchenko
dae4f313e2 merged with master 2024-03-26 19:09:21 +02:00
Igor Kulikov
f2b4bce2c8 Merge branch 'hotfix/3.6.3' 2024-03-26 12:57:06 +02:00
Igor Kulikov
02df0728dc Merge branch 'master' into feature/swagger3.1 2024-03-26 12:25:51 +02:00
Andrii Landiak
2e91612534 Minor refactoring 2024-03-25 14:04:08 +02:00
Andrii Landiak
8fb54e6759 Merge remote-tracking branch 'upstream/master' into fix/kv-proto-util 2024-03-25 13:33:38 +02:00
ViacheslavKlimov
2e20ad6dc6 Add tenantId tag to Rule Engine consumer stats 2024-03-25 12:51:58 +02:00
Andrii Landiak
7edb18673c Improve test for KvProtoUtil 2024-03-25 12:47:20 +02:00
Igor Kulikov
ffd67873ef Merge branch 'master' into feature/swagger3.1 2024-03-25 12:11:55 +02:00
ViacheslavKlimov
03cb21b79a Merge branch 'hotfix/3.6.3' into master-with-hotfix
# Conflicts:
#	common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
2024-03-25 09:56:57 +02:00
Igor Kulikov
8910b4b1df Swagger docs Open API 3.1 2024-03-22 20:02:51 +02:00
ViacheslavKlimov
ed44db6d25 Add delivery_method column to notification; persist mobile notifications 2024-03-22 14:20:51 +02:00
Andrii Landiak
d9669c9391 Fix TbSubscriptionUtils order for matching KeyValueType and DataType 2024-03-22 14:05:25 +02:00
dashevchenko
11b8d3c41e added global queue prefix for pubsub queue factory 2024-03-22 13:06:58 +02:00
Iryna Matveieva
f4ca0c8c90
Merge branch 'master' into improve-script-node 2024-03-22 12:37:25 +02:00
IrynaMatveieva
242b712a90 fixed conflicts 2024-03-22 12:35:59 +02:00
Andrii Landiak
ee1209b19f Fix KvProtoUtils order for matching KeyValueType and DataType 2024-03-22 12:01:36 +02:00
Andrii Landiak
37d5405dc5 Merge remote-tracking branch 'upstream/master' into feature/edge-oauth-support 2024-03-21 11:17:16 +02:00
dashevchenko
ab638cfa19 add defaultSorting by default 2024-03-20 18:53:26 +02:00
ViacheslavKlimov
ae23532ab6 Merge remote-tracking branch 'origin/master' into develop/3.6.4 2024-03-20 14:00:57 +02:00
ViacheslavKlimov
7dd81ffb93 Ignore invalid lwm2m tests 2024-03-19 16:28:52 +02:00
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
ViacheslavKlimov
ca174d209f Merge branch 'master' into develop/3.6.4 2024-03-18 12:39:39 +02:00
ViacheslavKlimov
eb50685108 Version control - not rollback on error option 2024-03-15 11:28:04 +02:00
ViacheslavKlimov
dc1a8dc35e Merge remote-tracking branch 'origin/develop/3.6.4' into hotfix/3.6.3 2024-03-13 13:05:02 +02:00
rusikv
dad8176e37 UI: reconfig of 'Rule engine statistics' and 'API usage' to enable 'QUEUE_STATS' after echarts update 2024-03-13 13:02:43 +02:00
Viacheslav Klimov
89a1c44673
Merge pull request #10311 from irynamatveieva/fix-error-mqtt-node
Fixed TLS Factory error when no password set in configuration
2024-03-13 12:17:43 +02:00
Andrii Shvaika
446ff16897 License format 2024-03-13 11:20:10 +02:00
rusikv
6057c17acc Merge remote-tracking branch 'upstream/master' into queueStatsEntity 2024-03-12 19:15:09 +02:00
IrynaMatveieva
837933a2e0 moved the static toPlainText() method to the JacksonUtil class 2024-03-12 18:53:45 +02:00
ViacheslavKlimov
7a05620a52 Merge remote-tracking branch 'origin/hotfix/3.6.2' 2024-03-12 18:47:36 +02:00
IrynaMatveieva
d67fd993bb added a method to get only the last IN debug event 2024-03-12 17:58:11 +02:00
Andrii Landiak
9f6c9e7330 Merge remote-tracking branch 'upstream/develop/3.6.4' into feature/edge-oauth-support 2024-03-12 11:12:29 +02:00
dashevchenko
a031104a0b added default sorting if not exists 2024-03-11 11:42:26 +02:00
dashevchenko
658f6679bc improved error logging 2024-03-07 15:41:14 +02:00
dashevchenko
2e216242f2 clone repo if tmp directory was deleted 2024-03-07 14:44:20 +02:00
Iryna Matveieva
4a79635b3e
Merge branch 'master' into fix-error-mqtt-node 2024-03-07 11:43:00 +02:00
IrynaMatveieva
0177b5fdc7 added a method for getting a password with a null checking 2024-03-06 17:56:51 +02:00
Andrew Shvayka
9d7f4de270
Merge pull request #10309 from YevhenBondarenko/hotfix/lwm2m-deserialization
fixed lwm2m client deserialization
2024-03-06 17:01:12 +02:00
YevhenBondarenko
270a023c5e fixed deserialization lwm2m client 2024-03-06 13:56:57 +01:00
ViacheslavKlimov
ff18b8712a Fix null values in Firebase message data 2024-03-06 14:03:05 +02:00