ViacheslavKlimov
|
14acf7922c
|
Merge branch 'develop/3.5' into improvements/notification-system
|
2023-03-28 16:50:56 +03:00 |
|
ViacheslavKlimov
|
c4827f20f3
|
API usage limit notification rule
|
2023-03-28 13:29:49 +03:00 |
|
Andrii Landiak
|
1674223e63
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-28 12:01:41 +03:00 |
|
Volodymyr Babak
|
c13d2ae144
|
Merge remote-tracking branch 'origin/develop/3.5' into edge-alarm-id
|
2023-03-28 09:54:47 +03:00 |
|
ViacheslavKlimov
|
408eb0bc02
|
Refactor notification rules processing
|
2023-03-27 14:37:07 +03:00 |
|
imbeacon
|
01996334e2
|
Refactoring, added tests
|
2023-03-27 13:53:36 +03:00 |
|
YevhenBondarenko
|
43efbbe8b9
|
fixed testSystemInfoTimeSeriesWsCmd
|
2023-03-24 17:29:09 +01:00 |
|
Andrii Shvaika
|
e5b661454e
|
Merge branch 'feature/home-page' of github.com:YevhenBondarenko/thingsboard into feature/home-page
|
2023-03-24 17:25:52 +02:00 |
|
YevhenBondarenko
|
af13292b4b
|
Merge remote-tracking branch 'vklimov/feature/notification-system' into feature/notification-system
|
2023-03-24 14:24:12 +01:00 |
|
ViacheslavKlimov
|
54f9240c08
|
Fix tests
|
2023-03-24 15:21:57 +02:00 |
|
Volodymyr Babak
|
fc4be34d55
|
Added edgeAlarmId into AlarmCreateOrUpdateActiveRequest. BaseAlarmProcessor - use alarmId from cloud
|
2023-03-24 14:22:34 +02:00 |
|
Vladyslav_Prykhodko
|
eea6e5a5e6
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-24 13:42:44 +02:00 |
|
ViacheslavKlimov
|
4673e812b0
|
Fix notification system tests
|
2023-03-24 13:21:25 +02:00 |
|
Andrew Shvayka
|
0b0fb2e6e5
|
Merge pull request #8253 from adovh/bug/fix-alarm-assignment-check-user-id
[3.5] added assignee check for alarm
|
2023-03-24 11:52:26 +02:00 |
|
YevhenBondarenko
|
0101f6fc90
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page
|
2023-03-23 22:14:45 +01:00 |
|
YevhenBondarenko
|
a35b3cd6ad
|
System info improvements
|
2023-03-23 21:54:14 +01:00 |
|
YevhenBondarenko
|
37a5aeb485
|
implemented features info
|
2023-03-23 16:34:51 +01:00 |
|
Andrii Landiak
|
82c95f519d
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-23 15:18:38 +02:00 |
|
AndriiD
|
0788a89f54
|
added assignee check to controller
|
2023-03-23 14:07:35 +02:00 |
|
ViacheslavKlimov
|
5e400726d3
|
Merge branch 'develop/3.5' into feature/notification-system
|
2023-03-23 12:36:08 +02:00 |
|
ViacheslavKlimov
|
cda1836986
|
Recipient preview for notification request; template params functions
|
2023-03-22 18:11:54 +02:00 |
|
YevhenBondarenko
|
befa454017
|
save system info to api usage, and added tests
|
2023-03-22 13:18:43 +01:00 |
|
deaflynx
|
038a714e87
|
Merge remote-tracking branch 'alandiak/feature/x509-device-cert-impr' into feature/x509-device-cert-impr
|
2023-03-22 12:15:54 +02:00 |
|
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 |
|