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

12046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
ViacheslavKlimov
58b9b1b6d3 Clear notification system entities on cascade on tenant's deletion 2022-12-19 20:07:52 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
Andrew Shvayka
6b53b609a3
Merge pull request #7803 from YevhenBondarenko/fix/bulk-import-test 
[3.4.3]fixed bulk import test infinite await
 2022-12-15 14:37:58 +02:00
YevhenBondarenko
df28b21733 fixed bulk import test infinite await 2022-12-15 13:19:03 +01:00
Andrii Shvaika
bb79dbf273 Release notes autogeneration 2022-12-15 14:18:20 +02:00
Andrew Shvayka
3c84ad5072
Merge pull request #7791 from YuriyLytvynchuk/bugfix/split_array_node 
[3.5] Bugfix: Node 'split array msg'. Empty array
 2022-12-15 12:43:46 +02:00
dashevchenko
b567341481 added DeviceProfileService and AssetProfileService to TBContext 2022-12-15 12:36:23 +02:00
Andrew Shvayka
10587d797e
Merge pull request #7788 from ViacheslavKlimov/fix/sysadmin-ws-session 
[3.4.3] Fix NPE on WS subscription for sysadmin
 2022-12-15 12:07:51 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
ViacheslavKlimov
377f59400d BaseController refactoring: remove boilerplate permission checks 2022-12-14 18:57:57 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
Andrew Shvayka
7b2494c1e0
Merge pull request #7786 from YevhenBondarenko/fix/device-with-credentials 
[3.4.3] fixed saveDeviceWithCredentials notifications
 2022-12-13 17:02:29 +02:00
Andrew Shvayka
28d151b940
Merge pull request #7783 from YevhenBondarenko/fix/bulk-import 
[3.4.3] fixed device bulk import with empty credentials
 2022-12-13 16:58:17 +02:00
Igor Kulikov
a6f2d114f1 UI navigation improvements 2022-12-13 16:28:30 +02:00
Yuriy Lytvynchuk
603f71bbe2 fix empty array & nodeDetails 2022-12-13 16:09:36 +02:00
Igor Kulikov
5645527a3b Update TBEL version to 1.0.4 2022-12-13 15:20:04 +02:00
ViacheslavKlimov
4a834a0442 Fix NPE on WS subscription for sysadmin 2022-12-13 15:06:29 +02:00
Andrew Shvayka
db0288dda3
Merge pull request #7784 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix for ts subscription handling
 2022-12-13 13:04:13 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
YevhenBondarenko
7cb9166677 fixed saveDeviceWithCredentials notifications 2022-12-13 10:58:34 +01:00
ViacheslavKlimov
139e5d28fb Fix handleGetTsCmd: add to lastTsMap 2022-12-13 10:57:29 +02:00
YevhenBondarenko
d2233e5157 added bulk import device test 2022-12-12 18:40:50 +01:00
YevhenBondarenko
3430425086 fixed device bulk import with empty credentials 2022-12-12 16:40:43 +01:00
Andrii Shvaika
67340baddf Performance improvement to update procedure 2022-12-12 16:44:54 +02:00
Andrew Shvayka
5e1fa45a10
Merge pull request #7768 from ViacheslavKlimov/fix/pagelink-validation 
[3.4.3] Additional pageLink validation
 2022-12-12 16:35:46 +02:00
Andrew Shvayka
4ce6cd0901
Merge pull request #7773 from volodymyr-babak/bug/fix-duplicate-ws-updates 
[3.4.3][Bug] Getting a lot of updates over WS in case of aggregation query, even if no real updates happened
 2022-12-12 16:33:41 +02:00
Volodymyr Babak
8df0078989 TbEntityDataSubCtx. getCurrentAggregation() - if curTsCmd or curTsCmd.getAgg is null - return NONE 2022-12-12 16:02:38 +02:00
Volodymyr Babak
3659c6d5b3 TbEntityDataSubCtx. getCurrentAggregation() - Added safe for null and return NONE in case null 2022-12-12 15:55:58 +02:00
Andrew Shvayka
0ee678e234
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
 2022-12-12 15:54:29 +02:00
Andrew Shvayka
900da54a13
Merge pull request #7778 from ViacheslavKlimov/improvement/vc 
[3.4.3] VC: 'Show merge commits' option, improved entity versions comparing
 2022-12-12 15:48:13 +02:00
ViacheslavKlimov
606bab64bc Fix for handleGetTsCmd when fetchLatestPreviousPoint is enabled 2022-12-12 13:57:19 +02:00
ViacheslavKlimov
4851f1af9f Fix comparing entity versions: ignore tenantId and createdTime 2022-12-09 19:03:57 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
ViacheslavKlimov
2494cec616 Add validation for EntityDataPageLink 2022-12-09 16:25:09 +02:00
Volodymyr Babak
7042d05149 Set correct latest ts for key states in case of timeseries aggregation query 2022-12-09 15:58:35 +02:00
Volodymyr Babak
65dd15e4f0 Removed unused code for deletePartitionStmt and all related functions 2022-12-09 15:48:42 +02:00
ViacheslavKlimov
bb42362f1d Add pageLink sort property validation 2022-12-09 12:21:40 +02:00
ViacheslavKlimov
a272b46780 Add log when queryId in ReadTsKvQueryResult not matching 2022-12-08 14:21:47 +02:00
ViacheslavKlimov
28d6e4c736 Copy queryId when updating query 2022-12-08 13:16:34 +02:00
Igor Kulikov
3a3771db64 UI: Fix handling dashboard page router data 2022-12-07 15:34:42 +02:00
Igor Kulikov
3c571d50d4
Merge pull request #7752 from ViacheslavKlimov/fix/asset-update-event 
[3.4.3] Fix asset's profile changing
 2022-12-07 15:10:58 +02:00
ViacheslavKlimov
368e2d1290 Broadcast entity state change event on asset update or delete 2022-12-07 14:18:13 +02:00
ViacheslavKlimov
17e4b322c1 Set notificationRuleId in TbCreateAlarmNode 2022-12-06 10:19:08 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
Igor Kulikov
f7c630d276 Update rule nodes UI 2022-12-01 17:56:26 +02:00
Igor Kulikov
7dd9a491b9 Add id indexes on new partitioned tables 2022-12-01 12:38:41 +02:00