6088 Commits

Author SHA1 Message Date
YevhenBondarenko
ada9ff7b4e merge with develop/3.5.2 2023-08-18 16:48:48 +02:00
Igor Kulikov
c57cb2b754 Switch to unique widget type FQN. 2023-08-18 16:14:21 +03:00
imbeacon
38f255ea0d Removed not required service mock 2023-08-18 14:56:56 +03:00
imbeacon
5e9bfa32f5 Updated import for Awaitility 2023-08-18 14:26:22 +03:00
imbeacon
853dfed14c Removed unnecessary imports 2023-08-18 14:12:19 +03:00
imbeacon
64e60d43f0 Moved event listener to HouseKeeper service and added method to get representation from AlarmAssignee 2023-08-18 14:06:08 +03:00
ViacheslavKlimov
2a87f2ee7e Minor improvements for internal system notifications 2023-08-18 13:40:38 +03:00
ViacheslavKlimov
ba2ded02b1 Notification to sysadmin when default JWT signing key is used 2023-08-18 13:24:57 +03:00
Vladyslav_Prykhodko
35284eacd6 Merge branch 'feature/alarm-types' of github.com:YevhenBondarenko/thingsboard into YevhenBondarenko-feature/alarm-types 2023-08-18 12:52:21 +03:00
imbeacon
4bfe4395f6 Refactored user represantation for system comments in alarms 2023-08-18 12:47:21 +03:00
Maksym Dudnik
6fd269063b Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list
 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
2023-08-18 12:43:29 +03:00
imbeacon
c4d12c6ba9 Refactored DefaultTbAlarmService, added improvements for alarm unassignment on user removing, updated namings and tests. 2023-08-18 12:03:27 +03:00
Andrew Shvayka
3186789f3e
Merge pull request #9062 from AndriiLandiak/feature/edge-tenant-sync
Feature/Edge: tenant and tenant profile sync up
2023-08-17 17:35:42 +03:00
Andrew Shvayka
49aa60a934
Merge pull request #9091 from volodymyr-babak/edge-json-attr-fix
Edge Attribute Request processing - added support of JSON attributes
2023-08-17 17:34:51 +03:00
Andrew Shvayka
d9dee141c1
Merge pull request #8843 from thingsboard/feature/microsoft-teams-notifications
Notifications via Microsoft Teams
2023-08-17 17:33:14 +03:00
Andrii Shvaika
4044baba82 Merge branch 'develop/3.5.2' of github.com:thingsboard/thingsboard into develop/3.5.2 2023-08-17 14:36:30 +03:00
Andrii Shvaika
54ef3aaafa Merge with master 2023-08-17 14:36:15 +03:00
Igor Kulikov
72db906fef Merge branch 'develop/3.5.2' into feature/basic-widget-config 2023-08-17 14:32:28 +03:00
Igor Kulikov
afd51946bb UI: Update default aggregated value card config. 2023-08-17 14:30:06 +03:00
Andrii Shvaika
80f80496df Merge with master 2023-08-17 14:14:13 +03:00
Andrew Shvayka
b36d7c1bcd
Merge pull request #9089 from thingsboard/improvements/version-control
Fixes for Version Control
2023-08-17 13:54:34 +03:00
Igor Kulikov
b7b34da831 UI: Auto-switch to edit mode for empty dashboard. Navigate to dashboard page right after adding dashboard. Implement aggregated value card advanced settings form. 2023-08-17 13:09:16 +03:00
dashevchenko
bd5aae46d9 fixed testConnection method for mail sender if oauth2 enabled 2023-08-17 12:36:06 +03:00
Andrii Shvaika
ca6095402f Merge with master 2023-08-17 12:19:02 +03:00
ViacheslavKlimov
8a023e9655 Merge with develop/3.5.2 2023-08-16 18:11:45 +03:00
ViacheslavKlimov
d30f8a8352 Minor refactoring 2023-08-16 17:53:44 +03:00
Igor Kulikov
965b526b7c UI: Update aggregated value card config 2023-08-16 17:43:12 +03:00
Volodymyr Babak
378fc545de Edge Attribute Request processing - added support of JSON attributes properly: use JSON type instead of String 2023-08-16 15:55:52 +03:00
ViacheslavKlimov
f6e816edb9 Add tests for rule chain importing 2023-08-16 15:13:46 +03:00
ViacheslavKlimov
cc1c2094c9 Fix UUIDs in rule node config replaced with tenant id 2023-08-16 15:13:16 +03:00
ViacheslavKlimov
7e57286667 Fix import order of asset profiles 2023-08-16 14:58:32 +03:00
ViacheslavKlimov
b457c5d19f Increase default timeouts for Version control 2023-08-16 14:58:04 +03:00
imbeacon
6ae894702a Merge remote-tracking branch 'upstream/develop/3.5.2' into customer-removing-alarm-unassign 2023-08-16 14:28:04 +03:00
Andrii Landiak
e53ea0f20b Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/edge-tenant-sync 2023-08-16 13:44:45 +03:00
imbeacon
35b86999b1 Added timestamp to entity deleted event, to have correct assign ts in alarms after unassignment 2023-08-16 11:18:31 +03:00
imbeacon
f722ad0757 Updated test with HouseKeeper service 2023-08-16 10:52:15 +03:00
Andrii Landiak
06aa6d680a Replace order of processUplinkMsg 2023-08-16 09:28:27 +03:00
Andrii Landiak
5ee110b47e Refactoring: process correct log warning, remove extra locks to process msg from edge 2023-08-16 09:24:00 +03:00
imbeacon
4b8db9f37d Refactored repository method for getting assigned alarms, added limitations, logs and adopted tests for event based model alarms unassigning on user removing 2023-08-16 09:09:40 +03:00
Andrii Landiak
308674ddc7
Create entity on edge and send to cloud 2023-08-16 08:08:56 +03:00
imbeacon
19c5e50884 Updated due to comments 2023-08-15 18:24:38 +03:00
Andrew Shvayka
18a617472a
Merge pull request #8793 from thingsboard/feature/account-notification-settings
User-level notification settings
2023-08-15 17:45:49 +03:00
Igor Kulikov
943788f25e UI: Aggregated value card 2023-08-15 17:39:14 +03:00
ViacheslavKlimov
d8896fe9dd Minor refactoring for user notification settings 2023-08-15 17:34:10 +03:00
ViacheslavKlimov
97e9f43f65 Add createCondition to TbActorCtx 2023-08-15 17:20:52 +03:00
YevhenBondarenko
1c17b00513 added alarm_types table 2023-08-15 16:00:14 +02:00
ViacheslavKlimov
b8a7c6a3cd Don't init unneeded actors and consumers for dedicated Rule Engine 2023-08-15 16:40:26 +03:00
Andrew Shvayka
389d05a567
Merge pull request #8841 from YevhenBondarenko/fix/inactivity
fixed update inactivity timeout attribute
2023-08-15 12:50:09 +03:00
Sergey Matvienko
a8f5602036 SQL partial index added idx_notification_recipient_id_unread for cheap and fast notification count on UI 2023-08-15 00:25:50 +02:00
ViacheslavKlimov
ce06ea10ca Use user settings api instead of additionalInfo 2023-08-14 17:43:39 +03:00