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

12020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Igor Kulikov
0c6832b2ad Merge branch 'master' of github.com:thingsboard/thingsboard 2022-12-01 12:36:30 +02:00
Igor Kulikov
e421acbf6e Add id indexes on new partitioned tables 2022-12-01 12:36:19 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
Igor Kulikov
4606b875c6 Update docker compose volumes yml syntax 2022-12-01 10:19:55 +02:00
Igor Kulikov
13e2f01af3 Update TBEL version to 1.0.3. 2022-11-30 20:57:54 +02:00
Andrew Shvayka
f191f6d382
Merge pull request #7686 from trikimiki/master 
[3.4.2] Docker microservices - Compatibility with Compose V2
 2022-11-30 16:34:39 +02:00
Volodymyr Babak
6413236411 Docker-compose - 3 -> 3.0 2022-11-30 15:18:52 +02:00
Volodymyr Babak
f959da7f52 Docker-compose - remove scale and add compatibility mode for docker-compose standalone 2022-11-30 15:17:13 +02:00
Andrew Shvayka
2ceb6c86bd
Merge pull request #7665 from imbeacon/provisioning-blackbox-tests 
[3.4.2] Provisioning black box tests
 2022-11-30 15:06:46 +02:00
Illia Barkov
2694b74ff9
Update pom.xml 
Updated pom file according to comment.
 2022-11-30 14:41:48 +02:00
Andrii Shvaika
23cf9bff35 Improved log level 2022-11-30 14:34:56 +02:00
Andrew Shvayka
dfdb2e5bf8
Merge pull request #7704 from ViacheslavKlimov/fix/concurrent-partition-creation-errors 
[3.4.2] Fix issues with partition creation
 2022-11-30 14:33:03 +02:00
Andrew Shvayka
e8c5a71a16
Merge pull request #7707 from thingsboard/bug/6008 
Bug 6008: OTA image assigned to device profile does not populate device shared properties
 2022-11-30 14:21:25 +02:00
Andrii Shvaika
91602ff670 Minor refactoring to use the helper function 2022-11-30 14:19:15 +02:00
Peter Chen
7914f3d1d0 minor refactoring code to get OTA package id 2022-11-30 14:16:28 +02:00
Peter Chen
cc3372d963 fix thingsboard issue #6008 2022-11-30 14:16:19 +02:00
Andrew Shvayka
c7670c248a
Merge pull request #7699 from YevhenBondarenko/fix/queues 
[3.4.2] fixed queue notifications in monolith
 2022-11-30 13:15:49 +02:00
Volodymyr Babak
01d9af24b4 Remove deprecated scale 2022-11-30 13:14:25 +02:00
Volodymyr Babak
334890069c Added comment that deploy.replicas is not supported by docker-compose 2022-11-30 13:01:53 +02:00
Volodymyr Babak
af69cf576b Update docker-compose files version from 2.2 to 3. Replace scale with deploy.replicas 2022-11-30 12:59:45 +02:00
ViacheslavKlimov
39341d1414 Fix transaction abortion on partition save error; don't throw any exceptions 2022-11-30 12:55:51 +02:00
Volodymyr Babak
15c34bfc11 Added comment that scale docker compose config is not supported 2022-11-30 12:25:51 +02:00
Volodymyr Babak
b25d33f3a6 Added comment for js-executor scale config in docker-compose to update correctly in case docker compose plugin V2 is used 2022-11-30 12:23:14 +02:00
Volodymyr Babak
45e2a3e912 Revert removed line 2022-11-30 10:50:26 +02:00
Volodymyr Babak
c01f0c0b1d Merge remote-tracking branch 'upstream/master' 2022-11-30 10:48:32 +02:00
Volodymyr Babak
a22f3925cf Merge remote-tracking branch 'origin/trikimiki-master' 2022-11-30 10:46:07 +02:00