4268 Commits

Author SHA1 Message Date
Yuriy Lytvynchuk
8229ddfe7a refactoring coap-tests-speed-up 2022-05-27 14:57:42 +03:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00
Yuriy Lytvynchuk
4ebab753c6 refactoring coap-tests-speed-up 2022-05-27 12:03:24 +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
Volodymyr Babak
2ef05c037c Remove unused methods 2022-05-26 18:09:12 +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
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
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
Igor Kulikov
65dc70c51b UI: Add entity versions text search support. Minor improvements and fixes. 2022-05-26 11:11:58 +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
Yuriy Lytvynchuk
7ed34c16eb refactoring coap-tests-speed-up 2022-05-25 16:23:24 +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
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
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
Viacheslav Klimov
7c1d0fb646 Permission check for getDeviceProfileInfoById 2022-05-24 12:50:45 +03:00
Andrii Shvaika
49e91341de Merge with feature branch 2022-05-24 12:32:59 +03:00
Andrii Shvaika
1065fd9fbe Implementation of the API 2022-05-24 11:38:03 +03:00
Viacheslav Klimov
e6ccef98e3 Merge remote-tracking branch 'origin/feature/entities-version-control' into entities-vc-refactoring
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
#	application/src/main/java/org/thingsboard/server/service/sync/vc/LocalGitVersionControlService.java
2022-05-24 11:09:45 +03:00
Igor Kulikov
0d57f2f6c2 Use page link to get versions list 2022-05-23 18:19:07 +03:00