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

10517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Volodymyr Babak
fde394faf9 Minor code review fix 2022-05-26 17:20:34 +03:00
Vladyslav_Prykhodko
76de891890 UI: 2fa improvement settings 2022-05-26 16:26:14 +03:00
Viacheslav Klimov
eeb7dc2338 Improvements for 2FA 2022-05-26 16:13:24 +03:00
Andrii Shvaika
30b75c9a87 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-26 15:31:26 +03:00
Andrii Shvaika
576c34b41a Delete repository on Tenant Deletion 2022-05-26 15:28:45 +03:00
nickAS21
9fe5f1fea1 refactoring: OtaPackageController 2022-05-26 15:25:05 +03:00
Viacheslav Klimov
9c2f96b262 Merge remote-tracking branch 'origin/feature/entities-version-control' into entities-vc-refactoring 
# Conflicts:
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
 2022-05-26 15:22:24 +03:00
Viacheslav Klimov
e4ed8c5080 Api for comparing current entity data to specific version; refactoring 2022-05-26 15:10:46 +03:00
Igor Kulikov
c46b5b6448 Fix message 2022-05-26 14:34:25 +03:00
Igor Kulikov
6558b0b24d UI: Improve restore action 2022-05-26 14:27:22 +03:00
Vladyslav_Prykhodko
67e969fd75 UI: 2fa improvement mobile view; remove required maxVerificationFailuresBeforeUserLockout 2022-05-26 13:59:53 +03:00
Igor Kulikov
65ce80e383 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-26 13:51:05 +03:00
Igor Kulikov
46e0c7c908 UI: Implement entity version restore 2022-05-26 13:50:50 +03:00
Andrii Shvaika
905b60da6a Fix GitRepository.status command, Increased timeout between poll commands. 2022-05-26 12:32:51 +03:00
Volodymyr Babak
4a77cc27cb Renaming ..ToEdgeService to ..ToEdge 2022-05-26 12:24:41 +03:00
Volodymyr Babak
c94f5f1d32 Merge remote-tracking branch 'upstream/develop/3.4' into feature/edge-converters-integration 2022-05-26 12:20:30 +03:00
Andrew Shvayka
c0f64c836e
Merge pull request #6593 from thingsboard/refactoring_05_DeviceProfileController_06_EntityRelationController 
[3.4] Refactoring: 05 device profile controller, 06 entity relation controller
 2022-05-26 11:20:21 +03:00
Igor Kulikov
65dc70c51b UI: Add entity versions text search support. Minor improvements and fixes. 2022-05-26 11:11:58 +03:00
Vladyslav_Prykhodko
152f5bc2a8 UI: Add action print backup code 2022-05-26 09:41:42 +03:00
Igor Kulikov
80456b9b7d Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 20:06:13 +03:00
Igor Kulikov
9d17ff1285 UI: Entity versions table improvement. Create entity version popover. 2022-05-25 20:05:59 +03:00
fe-dev
4dd2310a53 Merge remote-tracking branch 'YevhenBondarenko/feature/queue-entity' into feature/queue-entity 2022-05-25 18:46:04 +03:00
fe-dev
d99d4ebb0d UI: add id to queues and fixed bugs 2022-05-25 18:45:00 +03:00
ivankozka
b94b590e7c add version control queue factory realizations for other QueueFactories 2022-05-25 17:26:16 +03:00
Andrii Shvaika
8d57010a7b Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 17:20:31 +03:00
Andrii Shvaika
bd9c194a2b Async REST API calls 2022-05-25 17:20:14 +03:00
Igor Kulikov
c8abe3ac95 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 16:26:59 +03:00
Igor Kulikov
ed44304eac UI: Branch select improvements. Entity versions table improvements. 2022-05-25 16:26:39 +03:00
nickAS21
d74459d891 refactoring: EntityRelationController comments1 2022-05-25 15:45:30 +03:00
nickAS21
71b81f984a refactoring: from InterfaceSimple del TenantId and CustomerId 2022-05-25 14:39:08 +03:00
Andrii Shvaika
5bb9bdface Cache for VersionControlSettings 2022-05-25 13:43:35 +03:00
Andrii Shvaika
1fde08c90c Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 12:59:11 +03:00
Andrii Shvaika
4f2e1a25fd Docker compose scripts for TB Version Control Executor 2022-05-25 12:58:55 +03:00
YevhenBondarenko
2c862b138f added update queue config tests 2022-05-25 11:53:40 +02:00
nickAS21
0c1edc8685 refactoring: InterfaceSimple add TenantId and CustomerId 2022-05-25 12:49:42 +03:00
Vladyslav_Prykhodko
7af89eefb0 UI: Add support backup codes in 2FA 2022-05-25 12:33:36 +03:00
Igor Kulikov
a8966094bb Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 12:26:40 +03:00
Igor Kulikov
ca3c95afca UI: Implement entitiy versions table 2022-05-25 12:26:23 +03:00
Andrii Shvaika
dbec05a2c1 Test fix 2022-05-25 10:39:48 +03:00
nickAS21
aecaca734f refactoring: EntityRelationController fix bug testRelations 2022-05-24 23:33:39 +03:00
nickAS21
d00234b3a2 refactoring: EntityRelationController fix bug sendRelationNotification 2022-05-24 18:09:19 +03:00
Andrii Shvaika
701547e38f Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-24 17:32:42 +03:00
Andrii Shvaika
9deb67afe7 Version Control microservice 2022-05-24 17:32:29 +03:00
YevhenBondarenko
0b556f1763 fixed tests 2022-05-24 15:04:42 +02:00
nickAS21
15d9a3e956 refactoring: DeviceProfileController fix bug test MqttClaimDeviceTest 2022-05-24 15:01:24 +03:00
nickAS21
0aa86f5a72 refactoring: EntityRelationController removed unused code 2022-05-24 14:22:33 +03:00
Igor Kulikov
a5ff23a0a4 Add commit timestamp and timestamp sorting 2022-05-24 14:03:53 +03:00
nickAS21
724f7c8708 refactoring: DeviceProfileController, EntityRelationController 2022-05-24 13:52:38 +03:00
YevhenBondarenko
b6cbe0ca77 added additional info to queue configutation 2022-05-24 12:02:43 +02:00