3998 Commits

Author SHA1 Message Date
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
Andrii Shvaika
db34f7766f Merge with main branch 2022-05-23 17:55:43 +03:00
Viacheslav Klimov
8eb75f6e16 2FA backup codes 2022-05-23 16:40:27 +03:00
Igor Kulikov
2dcdb4af8e Fix Entities Version Control controller - add TbCoreComponent annotation 2022-05-23 15:36:57 +03:00
Viacheslav Klimov
55966e033e Fixes for vc api 2022-05-23 14:04:12 +03:00
Viacheslav Klimov
2a89fc67ae Git api usage improvements 2022-05-23 13:20:00 +03:00
Andrii Shvaika
4472bd7f7c Initial implementation of the ClusterVersionControlService 2022-05-23 12:50:59 +03:00
nickAS21
f76902009b refactoring: EntityViewController removed duplicate code 2022-05-22 21:09:04 +03:00
nickAS21
d58eb37cb8 refactoring: EntityViewController comments4 - saveEntityView from controller 2022-05-22 21:08:52 +03:00
nickAS21
d3a5597b51 refactoring: EntityViewController fix bug test entityView ->Id 2022-05-22 21:08:39 +03:00
nickAS21
91cb3b1826 refactoring: EntityViewController comments4 (NPE), fix bug test 2022-05-22 21:08:22 +03:00
nickAS21
d813ef560f refactoring: EntityViewController check entityView 2022-05-22 21:07:37 +03:00
nickAS21
91741f6b64 refactoring: EntityViewController TenantId CustomerId to service 2022-05-22 21:07:22 +03:00
nickAS21
907ac6da3d refactoring: EntityViewController comments1 2022-05-22 21:07:06 +03:00
nickAS21
e28f9a282e refactoring: EntityViewController 2022-05-22 21:06:50 +03:00
Andrii Shvaika
7071c7a6bc Implementation of the Git Queue service client 2022-05-20 17:33:24 +03:00
Igor Kulikov
76af741399 UI: Implement git settings form 2022-05-20 15:02:30 +03:00
Viacheslav Klimov
052cf3e502 Add verification code send period to providers info 2022-05-20 15:00:19 +03:00
Viacheslav Klimov
509962932c Change verificationCodeSendRateLimit to minVerificationCodeSendPeriod 2022-05-20 14:55:37 +03:00
Viacheslav Klimov
f2a4ebb136 'verificationCode' variable to 'code' in SMS 2FA message template 2022-05-20 12:50:06 +03:00
Andrii Shvaika
62c5c73237 Merge with queue API 2022-05-20 10:59:05 +03:00