17712 Commits

Author SHA1 Message Date
ViacheslavKlimov
be3e78044c Merge remote-tracking branch 'origin/master' into feature/housekeeper 2024-03-21 11:52:07 +02:00
Viacheslav Klimov
acabcb8462
Merge pull request #10406 from thingsboard/develop/3.6.4
develop/3.6.4 to master
2024-03-20 15:41:47 +02:00
ViacheslavKlimov
ae23532ab6 Merge remote-tracking branch 'origin/master' into develop/3.6.4 2024-03-20 14:00:57 +02:00
Andrew Shvayka
442f2a588a
Merge pull request #10399 from thingsboard/develop/3.7
develop/3.7 to master
2024-03-20 11:36:39 +02:00
ViacheslavKlimov
c4b8068e96 Use AttributeScope instead of DataConstants in DefaultDeviceStateServiceTest 2024-03-19 16:56:11 +02:00
ViacheslavKlimov
7dd81ffb93 Ignore invalid lwm2m tests 2024-03-19 16:28:52 +02:00
ViacheslavKlimov
2ee4d10621 Update TBEL version to 1.2.0 2024-03-19 16:24:06 +02:00
Viacheslav Klimov
4d0f330e40
Merge pull request #10397 from thingsboard/3.7-to-master
tmp master to 3.7
2024-03-19 15:59:52 +02:00
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
ViacheslavKlimov
1ed95b24a6 Clean up api usage state data on deletion 2024-03-18 18:02:06 +02:00
ViacheslavKlimov
66597eef2d Merge branch 'master' into develop/3.6.4 2024-03-18 16:59:13 +02:00
ViacheslavKlimov
302fed1888 Await tenant cleanup after tenant deletion in tests 2024-03-18 16:55:39 +02:00
Igor Kulikov
2a2d09be7d UI: Fix build 2024-03-18 15:05:51 +02:00
Igor Kulikov
a962483244 Merge branch 'master' of github.com:thingsboard/thingsboard 2024-03-18 13:28:25 +02:00
Igor Kulikov
7ead550348 UI: Update minor versions. 2024-03-18 13:28:11 +02:00
Viacheslav Klimov
3a7635dd81
Merge pull request #10387 from AndriiLandiak/fix/log-upgrade-error
Fix page size existingNotificationTypes for Edge
2024-03-18 12:53:58 +02:00
Andrii Landiak
f4733a44b4 Fix existingNotificationTypes for Edge 2024-03-18 12:47:32 +02:00
ViacheslavKlimov
ca174d209f Merge branch 'master' into develop/3.6.4 2024-03-18 12:39:39 +02:00
Igor Kulikov
f4c2791eb0 UI: update yarn.lock 2024-03-18 12:36:36 +02:00
ViacheslavKlimov
dfb40ecbe0 Skipped entity types list for cleaning up related data 2024-03-18 12:35:29 +02:00
Igor Kulikov
5da95a15a2 Update rule nodes UI 2024-03-18 12:29:57 +02:00
ViacheslavKlimov
a6719efee5 Housekeeper: alarms deletion 2024-03-18 12:24:58 +02:00
Igor Kulikov
59a2f771c6 Update UI help link 2024-03-18 12:20:42 +02:00
ViacheslavKlimov
b0d4faf798 Fix transactional calls in TransactionalEventListener 2024-03-16 15:49:40 +02:00
ViacheslavKlimov
fc865252a8 Use Autowired in TenantServiceImpl 2024-03-16 15:41:48 +02:00
Igor Kulikov
81cfb10752
Merge pull request #10374 from vvlladd28/bug/hide-notification-template
Fixed expand notification delivery template when editing
2024-03-15 17:44:32 +02:00
Igor Kulikov
beee0abf0a
Merge pull request #10370 from rusikv/bug/alarm-table-originator-sorting
Added sorting to 'Originator' column for alarm table
2024-03-15 17:44:19 +02:00
Igor Kulikov
53071ebaec UI: Improve time series charts stack handling. Decrease default animation duration parameter to 500ms. 2024-03-15 17:43:04 +02:00
Viacheslav Klimov
6a17910bd0
Merge pull request #10379 from vvlladd28/improvement/push-notification/apn
Add APNS config for push notification in mobile phone
2024-03-15 16:39:21 +02:00
Andrew Shvayka
749b60943f
Merge pull request #10380 from thingsboard/fix/device-state-executor
Add callback executor for device state service
2024-03-15 15:51:52 +02:00
ViacheslavKlimov
50f8951072 Add callback executor for device state service 2024-03-15 15:49:29 +02:00
Vladyslav_Prykhodko
883eebe430 Add APNS config for push notification in mobile phone 2024-03-15 15:28:00 +02:00
Vladyslav_Prykhodko
8ef012bfda UI: Fixed expand notification delivery template when editing 2024-03-15 10:56:43 +02:00
rusikv
e58906dd7a UI: added sorting to 'Originator' column for alarm talbe 2024-03-14 17:00:13 +02:00
Andrew Shvayka
01250f13e6
Merge pull request #10369 from vvlladd28/improvement/notificatiobn-setting/expaned-set
Improved notification settings behavior
2024-03-14 16:27:30 +02:00
Igor Kulikov
a6f19e5de3 Merge branch 'master' of github.com:thingsboard/thingsboard 2024-03-14 15:38:46 +02:00
Igor Kulikov
0fcb5aeaba Suppress JWT token expired error in websocket handler. 2024-03-14 15:38:36 +02:00
Vladyslav_Prykhodko
f49e7c5c0b UI: Improved notification settings behavior 2024-03-14 15:37:44 +02:00
Igor Kulikov
22041c072f
Merge pull request #10368 from vvlladd28/improvement/dialog-service/extend-dialog-component
Automatically close default dialogs (Alert/Confirm/Error) on route change
2024-03-14 12:43:35 +02:00
Vladyslav_Prykhodko
43de32fe9d UI: Automatically close default dialogs (Alert/Confirm/Error) on route change 2024-03-14 12:38:43 +02:00
Igor Kulikov
c4bc1ba6bb UI: Improve time series charts ticks generation. 2024-03-14 12:32:51 +02:00
Igor Kulikov
15a88a90a3 UI: time series chart - fix axis intervals calculation. 2024-03-13 20:32:24 +02:00
ViacheslavKlimov
a576a73b86 Housekeeper topic configs for all ymls 2024-03-13 20:08:17 +02:00
ViacheslavKlimov
22f5573e8d Housekeeper client for all service types 2024-03-13 19:59:13 +02:00
ViacheslavKlimov
82476b629c Max reprocessing attempts for Housekeeper task 2024-03-13 18:34:27 +02:00
Igor Kulikov
8a5280799c Merge branch 'master' of github.com:thingsboard/thingsboard 2024-03-13 18:31:02 +02:00
Igor Kulikov
60f40ad6b8 UI: Improve time series charts X axis and tooltip date formatting: introduce auto date format. 2024-03-13 18:29:35 +02:00
ViacheslavKlimov
20ea8c7fc2 Merge branch 'develop/3.6.4' into feature/housekeeper
# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
2024-03-13 16:39:10 +02:00
ViacheslavKlimov
0d3c3d6b25 Housekeeper: tests and refactoring 2024-03-13 14:09:05 +02:00
Viacheslav Klimov
92cd231034
Merge pull request #10358 from smatvienko-tb/feature/yarn_install_multi
Parallel and multiarch build on clean environment for yarn install
2024-03-13 12:08:38 +02:00