13621 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
f04fa1efd8 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-20 16:53:57 +02:00
Vladyslav_Prykhodko
1610cc143b UI: Fix linter error in notification 2023-03-20 16:51:42 +02:00
Andrii Shvaika
80f43b09fa Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system 2023-03-20 16:42:53 +02:00
Vladyslav_Prykhodko
5bcbf2dc6d UI: Add support hint for target type notification 2023-03-20 15:54:34 +02:00
nickAS21
8fa4617a7a sparkplug: commit1 2023-03-20 15:30:00 +02:00
Vladyslav_Prykhodko
d66d882a0c UI: Add new function in tenant profiles service 2023-03-20 15:07:28 +02:00
Vladyslav_Prykhodko
8a971dd577 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-20 14:53:21 +02:00
ViacheslavKlimov
1382c49881 Endpoint to find tenant profiles by ids 2023-03-20 14:06:53 +02:00
dashevchenko
74ce748059 changed default value for ws message queue limit per session from 0 to 1000 2023-03-20 12:10:08 +02:00
Vladyslav_Prykhodko
016b4efeea UI: Fix show long notification 2023-03-20 11:44:08 +02:00
ViacheslavKlimov
ea7f876d4d Tests fixes 2023-03-20 11:32:18 +02:00
ViacheslavKlimov
3f531d8235 Fix default notification configs creation; refactoring 2023-03-20 11:09:28 +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
nickAS21
2c7fc09ba1 Merge branch 'develop/3.5' into sparkplug-transport-proto 2023-03-19 11:10:20 +02:00
Vladyslav_Prykhodko
14b05a57bd UI: Add new notification template/rule RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT 2023-03-17 18:53:03 +02:00
nickAS21
14755d159e add new lwm2mObjectModels to install 2023-03-17 17:43:08 +02:00
ViacheslavKlimov
c34b6623ce Default notification configs; improvements 2023-03-17 17:17:34 +02:00
ViacheslavKlimov
e71da72360 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-17 17:09:15 +02:00
Vladyslav_Prykhodko
615e4a2865 UI: Add new notiifcation target 2023-03-17 16:35:34 +02:00
Igor Kulikov
33b1ba5b83 UI: Improve router tabs component 2023-03-17 16:22:55 +02:00
Andrew Shvayka
73b35a9e8c
Merge pull request #8232 from imbeacon/fix/alarm-assignment-sorting
[3.5] Fix/alarm assignment sorting
2023-03-17 15:44:03 +02:00
Andrew Shvayka
94f80eb46c
Merge pull request #8218 from Seraphym-Tuhai/allure
[3.5] Added epics, features and description on UI tests (Allure)
2023-03-17 15:38:33 +02:00
Andrew Shvayka
4972c5950d
Merge pull request #8233 from thingsboard/bug/rest-template-concurrency
REST client concurrency mode fix on token refresh
2023-03-17 15:23:09 +02:00
ViacheslavKlimov
6c40e2e40e Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-17 15:04:00 +02:00
Vladyslav_Prykhodko
e6a56d0099 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-17 14:41:09 +02:00
Igor Kulikov
8d3278c355 Add tenantId to device and asset profile info objects 2023-03-17 14:21:27 +02:00
Igor Kulikov
c03865e50b Add tenantId to device and asset profile info objects 2023-03-17 14:18:34 +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
Andrii Shvaika
1960d99504 REST template concurrency 2023-03-17 13:50:49 +02:00
zbeacon
a889649d32 Added sorting to test for alarm assignment, added and to where clause for filter by assigneeId 2023-03-17 12:55:44 +02:00
zbeacon
89ee862b13 Added sorting for alarm assignee field in query 2023-03-17 11:28:59 +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
Igor Kulikov
d5d7463904 UI: Entities route improvements. 2023-03-16 16:16:14 +02:00
Vladyslav_Prykhodko
ca2fac4b9d UI: Add new notification rule settings 2023-03-16 15:45:34 +02:00
Artem Dzhereleiko
5e212366c2 UI: Fixed height of expation panel for widget settings 2023-03-16 14:30:02 +02:00
Igor Kulikov
41d6f383c6 UI: Entities table header style improvement. 2023-03-16 13:26:58 +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
Igor Kulikov
fde346d8e4 UI: Router tabs improvements. Improve entities table to watch router data changes. 2023-03-16 13:07:10 +02:00
Artem Dzhereleiko
1172d1ce77 UI: Fixed expantion panel with hint 2023-03-16 13:05:46 +02:00
dashevchenko
c748702933 fixed tests 2023-03-16 12:37:10 +02:00
Seraphym-Tuhai
37cbc75968 Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into allure 2023-03-16 12:27:30 +02:00
YevhenBondarenko
d13a458eb0 saveCUrrentSystemInfo improvements 2023-03-16 10:21:40 +01:00
Artem Dzhereleiko
e96e355a31 UI: Fixed stepper for device and device profile dialog 2023-03-16 11:05:23 +02:00
YevhenBondarenko
118fc1554a added TbCoreComponent to the SystemInfoService 2023-03-15 18:01:29 +01:00
Vladyslav_Prykhodko
c7dbf6be89 UI: Add new notification type alarm assignment 2023-03-15 18:39:06 +02:00