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

10335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav_Prykhodko
f68bbd58d7 Change 2fa mail pattern to replace code 2022-05-30 15:35:07 +03:00
nickAS21
a6a58a3256 refactoring: RuleChainController comments1 2022-05-30 15:12:22 +03:00
fe-dev
19c313dbed Refactoring 2022-05-30 14:54:41 +03:00
YevhenBondarenko
a5c1cce884 added queue to rest client 2022-05-30 12:30:00 +02:00
nickAS21
a778305b03 refactoring: RuleChainController fix bug clientSideRpc() 2022-05-30 13:21:22 +03:00
Vladyslav_Prykhodko
65541b9aed UI: Fix style sms auth dialog 2022-05-30 13:00:57 +03:00
Andrii Shvaika
f0d887b91a NPE fix in DefaultTbContext 2022-05-30 12:16:30 +03:00
kalutkaz
29fef94692
Merge branch 'develop/3.4' into fix/adaptMarkerTripAnimation 2022-05-30 09:43:01 +02:00
nickAS21
6714f263ae refactoring: RuleChainController del double code 2022-05-28 14:12:09 +03:00
nickAS21
20c612b7cc refactoring: RuleChainController 2022-05-27 20:18:52 +03:00
Igor Kulikov
0be0df6015 UI: Implemented entity version diff component. 2022-05-27 19:34:55 +03:00
Vladyslav_Prykhodko
7836ad6f90 UI: Add validation 2fa settings 2022-05-27 17:34:09 +03:00
Vladyslav_Prykhodko
095851897a UI: Fixed 2fa auth.guard and setting style 2022-05-27 16:04:34 +03:00
fe-dev
4ba75a7c38 UI: Fixed build project 2022-05-27 15:37:36 +03:00
Igor Kulikov
351de50cbc Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-27 13:14:26 +03:00
Igor Kulikov
e86b37b4af UI: Initial implementation of entity versions diff component 2022-05-27 13:14:18 +03:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00
Vladyslav_Prykhodko
026361ce69 UI: Revert change 2022-05-27 10:35:17 +03:00
nickAS21
7b3a3dc103 refactoring: OtaPackageController fix bug testDeleteFirmware 2022-05-26 21:21:51 +03:00
nickAS21
105acc16ba refactoring: OtaPackageController fix bug tests with OtaPackage 2022-05-26 20:32:22 +03:00
Igor Kulikov
9d5ce7c82c
Merge pull request #6601 from ViacheslavKlimov/entities-vc-refactoring 
API to compare current entity data to specific version
 2022-05-26 17:53:06 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +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
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