dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,192 Commits 106 Branches 71 Tags
Commit Graph

6176 Commits

Author SHA1 Message Date
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
ViacheslavKlimov
655a2777e2 Merge branch 'develop/3.5.2' into feature/microsoft-teams-notifications 2023-08-14 17:00:01 +03:00
Andrii Shvaika
344ffb2e0b Merge with master 2023-08-14 15:02:17 +03:00
ViacheslavKlimov
6751820e0a Dedicated Rule Engines for tenant profile 2023-08-14 12:57:53 +03:00
ShvaykaD
d14ed53b64 rollback if-return refactoring to simplify review and save git history 2023-08-12 10:14:03 +03:00
Andrii Landiak
c164c68e12 Refactoring EdgeUtils to use enum map to match entity type with edge event type 2023-08-11 13:48:13 +03:00
ViacheslavKlimov
ae76f4ebbb Merge branch 'master' into feature/update-tenant-profile-isolation 2023-08-11 13:39:03 +03:00
Andrii Landiak
d56f6484b1 Add EntityType reference to EdgeEventType to match types for edge 2023-08-11 12:56:32 +03:00
imbeacon
e7543d78d4 Changed method for user removing, added user as an entity to deleted entity event 2023-08-11 07:56:08 +03:00
imbeacon
328d53dffc Changed alarms unassign method to returen ids instead of Alarm objects and changed to use entity from deleted entity event 2023-08-11 07:52:03 +03:00
ViacheslavKlimov
f32e2f6fde Refactoring after review 2023-08-10 12:03:15 +03:00
Andrii Landiak
9e1ab9abae
Feature/tenant profile edge sync 2023-08-10 10:38:38 +03:00
imbeacon
bd3c249fb2 Removed uneccessary import service 2023-08-10 08:25:04 +03:00