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

3744 Commits

Author SHA1 Message Date
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
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
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
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
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
Igor Kulikov
a5ff23a0a4 Add commit timestamp and timestamp sorting 2022-05-24 14:03:53 +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
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
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
Andrii Shvaika
62c5c73237 Merge with queue API 2022-05-20 10:59:05 +03:00
YevhenBondarenko
ee8c9deda9 refactoring 2022-05-19 23:55:16 +02:00
YevhenBondarenko
6c1031536d merge with develop/3.4 2022-05-19 17:17:04 +02:00
YevhenBondarenko
38fb68b200 fixed stoping RE consumers 2022-05-19 16:14:58 +02:00
YevhenBondarenko
b8f2d6ee9c added tenant profile upgrade 2022-05-19 13:09:40 +02:00
Igor Kulikov
4b01aa6f1e Clear repository on settings update 2022-05-19 13:21:19 +03:00
Igor Kulikov
587066cfd3 Ability to remove version control settings 2022-05-19 13:19:43 +03:00
Igor Kulikov
2eb94fd95e Fix beans cycle dependency 2022-05-19 12:38:06 +03:00
Igor Kulikov
cd30e9a4b1 Fix merge conflicts 2022-05-19 12:31:00 +03:00
YevhenBondarenko
e32e161745 fixed queue permissions 2022-05-19 11:13:31 +02:00
Igor Kulikov
0b6de71768 Implement version control ssh access with private key. Improve VC settings REST methods. Add tenantId field to admin settings. Add DB upgrade. 2022-05-19 12:01:06 +03:00
Andrew Shvayka
1ff24f149e
Merge pull request #6551 from thingsboard/refactoring_03_DashboardController 
[3.4] refactoring_03: - Dashboard controller
 2022-05-19 11:20:15 +03:00
YevhenBondarenko
fa4a20d711 Added resolve by queue name for backward compatibility 2022-05-19 10:04:51 +02:00
YevhenBondarenko
abe127c3fa fixed checkpoint node 2022-05-19 01:18:13 +02:00
YevhenBondarenko
4f7c166566 using repartitionExecutor instead of synchronized 2022-05-19 00:36:26 +02:00
YevhenBondarenko
92117d1280 used scheduler instead of thread sleep 2022-05-18 22:23:20 +02:00
Viacheslav Klimov
567ee5d75b Refactor loadEntitiesVersion 2022-05-18 18:49:21 +03:00
nickAS21
9e70cb362d refactoring: - dashboard delete remove generic 2022-05-18 15:56:46 +03:00
YevhenBondarenko
7f31069285 added loging and refactored 2022-05-18 13:51:51 +02:00
Andrii Shvaika
c6ebf049a2 Version Control Service refactoring 2022-05-18 14:46:54 +03:00
nickAS21
647012c2d4 refactoring: - dashboard comments4 2022-05-18 11:14:31 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00