dashevchenko
|
b8b1bce667
|
Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix
|
2023-03-21 19:18:58 +02:00 |
|
Vladyslav_Prykhodko
|
1b2b84e48e
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-21 15:32:23 +02:00 |
|
Igor Kulikov
|
240b0abb2a
|
Merge branch 'develop/3.5' into feature/menu-improvements
|
2023-03-21 13:34:20 +02:00 |
|
dashevchenko
|
b6adbd6ec8
|
moved logic to DefaultTbAlarmCommentService
|
2023-03-21 13:29:46 +02:00 |
|
ViacheslavKlimov
|
0308b0128d
|
Entities limit notifications
|
2023-03-20 17:33:34 +02:00 |
|
nickAS21
|
c6dbdeb23d
|
sparkplug:rebuild2
|
2023-03-20 10:04:37 +02:00 |
|
nickAS21
|
bca26cd247
|
sparkplug:rebuild
|
2023-03-20 09:59:55 +02:00 |
|
Igor Kulikov
|
eac7ce25a8
|
Add tenantId to device and asset profile info objects
|
2023-03-17 14:17:24 +02:00 |
|
ViacheslavKlimov
|
3b8ed5fae6
|
Notification rules improvements; new platform users filters
|
2023-03-17 14:03:03 +02:00 |
|
YevhenBondarenko
|
535b411b7e
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page
|
2023-03-17 10:01:17 +01:00 |
|
AndriiD
|
07e834bee0
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/work-1385-custom-mqtt-subscribe-topic
# Conflicts:
# application/pom.xml
# application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
# application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
# common/actor/pom.xml
# common/cache/pom.xml
# common/cluster-api/pom.xml
# common/coap-server/pom.xml
# common/dao-api/pom.xml
# common/data/pom.xml
# common/edge-api/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/queue/pom.xml
# common/stats/pom.xml
# common/transport/coap/pom.xml
# common/transport/http/pom.xml
# common/transport/lwm2m/pom.xml
# common/transport/mqtt/pom.xml
# common/transport/pom.xml
# common/transport/snmp/pom.xml
# common/transport/transport-api/pom.xml
# common/util/pom.xml
# common/version-control/pom.xml
# dao/pom.xml
# msa/black-box-tests/pom.xml
# msa/js-executor/pom.xml
# msa/pom.xml
# msa/tb-node/pom.xml
# msa/tb/pom.xml
# msa/transport/coap/pom.xml
# msa/transport/http/pom.xml
# msa/transport/lwm2m/pom.xml
# msa/transport/mqtt/pom.xml
# msa/transport/pom.xml
# msa/transport/snmp/pom.xml
# msa/vc-executor-docker/pom.xml
# msa/vc-executor/pom.xml
# msa/web-ui/pom.xml
# netty-mqtt/pom.xml
# pom.xml
# rest-client/pom.xml
# rule-engine/pom.xml
# rule-engine/rule-engine-api/pom.xml
# rule-engine/rule-engine-components/pom.xml
# tools/pom.xml
# transport/coap/pom.xml
# transport/http/pom.xml
# transport/lwm2m/pom.xml
# transport/mqtt/pom.xml
# transport/pom.xml
# transport/snmp/pom.xml
# ui-ngx/pom.xml
# ui-ngx/src/assets/locale/locale.constant-zh_CN.json
|
2023-03-17 04:38:18 +02:00 |
|
dashevchenko
|
ce7d56332b
|
Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix
|
2023-03-16 13:26:40 +02:00 |
|
ViacheslavKlimov
|
1e7c1a8a5a
|
Merge branch 'develop/3.5' into feature/notification-system
|
2023-03-16 13:12:35 +02:00 |
|
ViacheslavKlimov
|
4a20adc62e
|
Alarm related notification rules
|
2023-03-16 13:12:04 +02:00 |
|
dashevchenko
|
c748702933
|
fixed tests
|
2023-03-16 12:37:10 +02:00 |
|
ViacheslavKlimov
|
0d07d70818
|
Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system
|
2023-03-15 12:32:43 +02:00 |
|
ViacheslavKlimov
|
ba8f27fa76
|
Notification system refactoring and improvements
|
2023-03-15 12:32:23 +02:00 |
|
Sergey Matvienko
|
13b59bf85f
|
tests: awaitForDeviceActorToReceiveSubscription
|
2023-03-15 11:27:12 +01:00 |
|
YevhenBondarenko
|
0be3c0b5bb
|
removed countEntitiesByTypes and added ability to use Entity count query for sysadmin
|
2023-03-14 16:26:55 +01:00 |
|
Vladyslav_Prykhodko
|
88128640e9
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system
|
2023-03-14 16:37:50 +02:00 |
|
dashevchenko
|
210aae6a86
|
updated alarm comment deletion
|
2023-03-14 14:15:37 +02:00 |
|
Andrii Shvaika
|
d5177f5bbf
|
Fix attribute/RPC subscription tests
|
2023-03-14 13:52:21 +02:00 |
|
Andrew Shvayka
|
7229b7bfd8
|
Merge pull request #8203 from volodymyr-babak/edge-test-fix
sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeo…
|
2023-03-14 10:59:55 +02:00 |
|
Andrew Shvayka
|
167fb722fa
|
Merge pull request #8210 from zzzeebra/feature/assertJ_exception_assertions
[3.5] Rule ExpectedException refactored with AssertJ Exception Assertions
|
2023-03-14 10:58:01 +02:00 |
|
Oleksandra Matviienko
|
3841deae24
|
BaseTbResourceServiceTest, BaseDeviceServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions
|
2023-03-13 23:08:19 +01:00 |
|
Andrii Shvaika
|
ab5769a252
|
Merge with develop/3.5
|
2023-03-13 15:52:06 +02:00 |
|
Andrew Shvayka
|
494296996e
|
Merge pull request #8200 from smatvienko-tb/fix/lwm2m-lifecycle-refactor
[3.5] lwm2m lifecycle refactor
|
2023-03-13 15:20:53 +02:00 |
|
ViacheslavKlimov
|
378ae47acb
|
Alarm comments rule trigger config, NotificationInfo stateEntityId
|
2023-03-13 10:41:40 +02:00 |
|
Volodymyr Babak
|
0e01f1c74d
|
sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeout increased for run test stable on slow (busy) environments
|
2023-03-10 15:53:47 +02:00 |
|
Andrii Landiak
|
e665917758
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-10 15:46:42 +02:00 |
|
Sergey Matvienko
|
287999d46a
|
test scope: logs for lwm2m.server
|
2023-03-10 12:37:10 +01:00 |
|
Sergey Matvienko
|
fed47f699c
|
LwM2m lifecycle debug for the test scope
|
2023-03-10 12:16:41 +01:00 |
|
Sergey Matvienko
|
8352be035b
|
LWM2M bean lifecycle dependency fix to avoid executors shutdown before server stop. Dependencies refactored: implementations replaced with interfaces.
|
2023-03-10 11:52:45 +01:00 |
|
Andrew Shvayka
|
e058786956
|
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
[3.5] junit5 migration - exception annotation refactoring
|
2023-03-10 12:51:03 +02:00 |
|
Andrii Shvaika
|
43f2e3b521
|
Fix case when test runs to fast (within 1 millisecond)
|
2023-03-10 12:42:56 +02:00 |
|
Andrii Shvaika
|
d7ee0fca91
|
Fix attribute subscription tests
|
2023-03-09 16:45:15 +02:00 |
|
Andrii Shvaika
|
3477ddac0f
|
Refactoring due to comments
|
2023-03-08 17:39:39 +02:00 |
|
Andrii Shvaika
|
c905f20224
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug
|
2023-03-08 13:27:17 +02:00 |
|
ViacheslavKlimov
|
a56261ac9d
|
Merge with develop/3.5
|
2023-03-08 13:11:31 +02:00 |
|
Andrii Shvaika
|
aadf7f8295
|
Merge with develop/3.5
|
2023-03-06 17:59:37 +02:00 |
|
Oleksandra Matviienko
|
1ae8522bef
|
junit5: BasicMqttCredentialsTest annotation exceptions refactoring
|
2023-03-06 15:38:50 +01:00 |
|
Oleksandra Matviienko
|
6ca287cc68
|
junit5: BaseTbResourceServiceTest annotation exceptions refactoring
|
2023-03-06 15:23:36 +01:00 |
|
ViacheslavKlimov
|
a0796de0e4
|
Resolve merge conflicts
|
2023-03-06 10:45:32 +02:00 |
|
Vladyslav_Prykhodko
|
069ef4de5b
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-06 10:21:41 +02:00 |
|
Volodymyr Babak
|
de2590ac78
|
Merge remote-tracking branch 'upstream/develop/3.5' into filter-type-multiple-types
|
2023-03-03 09:22:21 +02:00 |
|
nickAS21
|
0587933d5e
|
sparkplug: validate namespace
|
2023-03-02 13:19:55 +02:00 |
|
Andrew Shvayka
|
109ccccd14
|
Merge pull request #8147 from smatvienko-tb/feature/testcontainers-cassandra
[3.5] Cassandra tests moved from cassandra-unit to testcontainers
|
2023-03-01 12:30:45 +02:00 |
|
Andrew Shvayka
|
f0ca2d48f7
|
Merge pull request #8129 from smatvienko-tb/feature/web-service-handler-subscription-improvements
[3.5] WebSocket subscription flow fix, WS refactoring and test improvements
|
2023-03-01 12:26:59 +02:00 |
|
Sergey Matvienko
|
ddca3ffcf3
|
spring.test.context.cache.maxSize=1 removed as well as it always eq 1 during application tests (no performance effect)
|
2023-03-01 01:13:49 +01:00 |
|
Sergey Matvienko
|
1bf579288a
|
tests: fixed test performance degradation (100% C2 Compiler) by removing -Xss384k and Mockito.clearAllCaches()
|
2023-03-01 01:05:19 +01:00 |
|