2962 Commits

Author SHA1 Message Date
Andrii Shvaika
74a2c58fa4 Merge the hotfixes 2024-01-17 16:04:14 +02:00
nick
4fe63cee70 lwm2m: add exception to ObserveCompositeCancel 2024-01-17 10:31:17 +02:00
nick
221629fb29 lwm2m: conflict resolution 2024-01-16 22:35:36 +02:00
nick
32e3d9050b Merge branch 'develop/3.7' into californium_3_9_1
# Conflicts:
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java
2024-01-16 21:15:44 +02:00
nick
e03005d780 lwm2m: add observation, composite observation, cancel observation 2024-01-16 18:44:20 +02:00
Andrii Landiak
b3f5d9885b Merge remote-tracking branch 'upstream/master' into develop/3.7 2024-01-16 11:49:43 +02:00
Andrii Shvaika
a3471c367a Merge PR#9968 2024-01-16 11:35:31 +02:00
Andrii Landiak
54ee0677ad Renaming SaveEntityEvent variable from added to created. Fix test 2024-01-16 09:39:19 +02:00
YevhenBondarenko
60be820915 merge with master 2024-01-15 18:51:00 +01:00
Andrii Landiak
28e9aae2e5 Merge remote-tracking branch 'upstream/master' into feature/edge-alarm-comment-support 2024-01-15 16:15:08 +02:00
Andrii Landiak
43e6a40290 Send alarm comment without rule node pushToEdge 2024-01-15 15:51:05 +02:00
Andrew Shvayka
d8073cdce4
Merge pull request #9990 from thingsboard/feature/grouping-interval-types
New types of the grouping intervals: WEEK, WEEK_ISO, MONTH, QUARTER
2024-01-15 13:40:58 +02:00
Andrii Shvaika
e9d86fc918 Test for the precise interval end 2024-01-15 13:38:15 +02:00
YevhenBondarenko
107a343b4d added tests 2024-01-15 00:06:05 +01:00
Andrii Landiak
f8440a4053 Merge remote-tracking branch 'upstream/develop/3.7' into feature/broadcast-logs-improvement 2024-01-12 14:59:17 +02:00
ViacheslavKlimov
8e126e57dc Refactoring and fixes for partitions recalculation 2024-01-12 13:46:19 +02:00
Andrii Landiak
78bcb5c4b4 Merge remote-tracking branch 'upstream/develop/3.7' into feature/broadcast-logs-improvement 2024-01-11 16:46:53 +02:00
YevhenBondarenko
200eed6cf5 merge with develop/3.7 2024-01-11 12:36:21 +01:00
Andrii Shvaika
7fc2231189 Interval types back-end implementation 2024-01-11 12:40:50 +02:00
Andrii Landiak
1478383db6 Fix tests. Improve TbMsgPushNode toCloud and toEdge description 2024-01-11 11:27:23 +02:00
Andrew Shvayka
4449ac4bb0
Merge pull request #9946 from AndriiLandiak/fix/edge-improve-push-device-message
Edge - improve Device Actor to detect edge relations on 'UNASSIGNED_FROM_EDGE'
2024-01-10 13:46:06 +02:00
Andrii Landiak
cae0aaf964 Fix license headers. Add test for alarm comments from edge 2024-01-10 13:04:38 +02:00
Andrii Landiak
1256f09e7e Introduce edge support for alarm comment 2024-01-10 10:19:07 +02:00
dashevchenko
e94a7e6cf7 fixed test 2024-01-09 18:43:07 +02:00
Vladyslav_Prykhodko
5739802fda Merge remote-tracking branch 'upstream/master' into feature/push-notifications 2024-01-09 15:20:49 +02:00
dashevchenko
56f9dce242 updated BaseAttributeService, InternalTelemetryService, RuleEngineTelemetryService to store old methods for backward compatibility 2024-01-09 12:27:40 +02:00
ViacheslavKlimov
aa38edb9ba Fix public resource key generation for images 2024-01-09 11:36:03 +02:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
nick
2b82768225 lwm2m: add Redis 2024-01-08 16:00:05 +02:00
ViacheslavKlimov
b1c0a04426 Delete notification settings on tenant deletion 2024-01-08 11:11:16 +02:00
Andrii Landiak
f15baf38ce Improve stability for testVerifyProcessCorrectEdgeUpdateToDeviceActorOnUnassignFromDifferentEdge 2024-01-05 15:09:30 +02:00
Andrii Landiak
6252433231 Fix DefaultTbClusterServiceTest 2024-01-05 14:34:32 +02:00
Andrii Landiak
e227caac51 Provide test for fixed bug 2024-01-05 14:27:36 +02:00
ViacheslavKlimov
17a3065c64 Add tests for mobile app notifications 2024-01-05 13:52:57 +02:00
ViacheslavKlimov
66c196cbcb Merge remote-tracking branch 'origin/master' into feature/push-notifications 2024-01-05 13:02:44 +02:00
nick
d59bab4f0f lwm2m: add to Client Write Attributes implemented and read Attributes (Discover) only for WriteAttributes test 2024-01-05 12:34:55 +02:00
nick
6bcb00b6b9 lwm2m: add test, Write Attributes implemented and read Attributes (Discover) 2024-01-04 12:16:06 +02:00
dashevchenko
e9c8445e53 merged with develop/3.7 2024-01-03 20:02:15 +02:00
Volodymyr Babak
d329df0323 Merge remote-tracking branch 'upstream/master' into feature/broadcast-logs-improvement 2024-01-02 19:37:39 +02:00
nick
8c5210b387 lwm2m: add test, 'dim' Attributes implemented 2024-01-02 19:31:25 +02:00
nick
a97f52c698 lwm2m: comments (why full import?) 2023-12-28 15:50:47 +02:00
nick
38fc45ffc1 Merge branch 'develop/3.7' into californium_3_9_1 2023-12-28 15:16:58 +02:00
YevhenBondarenko
61602330ec merge with 3.7 2023-12-28 12:16:14 +01:00
Andrew Shvayka
0df7b11827
Merge pull request #9910 from volodymyr-babak/edge-test-fix
Fixed EdgeControllerTest.testSyncEdge
2023-12-27 11:58:13 +02:00
ViacheslavKlimov
6c0c891f60 Merge branch 'master' into feature/push-notifications
# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
#	pom.xml
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
#	ui-ngx/src/app/modules/home/pages/notification/template/template-configuration.ts
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.scss
#	ui-ngx/src/app/shared/models/notification.models.ts
2023-12-27 11:49:28 +02:00
ViacheslavKlimov
22e598c36d Fix image's isPublic on import 2023-12-26 18:21:34 +02:00
nick
03560f0557 lwm2ml: add tests attributes 2023-12-26 17:26:51 +02:00
Volodymyr Babak
5915aed545 Code cleanup 2023-12-26 15:47:15 +02:00
Volodymyr Babak
9a1b2c923c Fixed testSyncEdge - moved creation of edge before device/asset creation to have time to process set edge root rule chain before activation 2023-12-26 15:46:02 +02:00
YevhenBondarenko
feb44656f1 merge with master 2023-12-26 00:58:31 +01:00