2404 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
da058ccfc1 UI: Fixed validation 2022-05-31 17:22:25 +03:00
Andrii Shvaika
7bd51cb4ce Public Customer import fix. No commit when no changes 2022-05-31 17:13:50 +03:00
Andrii Shvaika
59325226ac Sort order and diff fixes 2022-05-31 16:38:10 +03:00
Igor Kulikov
09402f40ac UI: Refactor vc settings to repository settings. Add remove other entities confirm. 2022-05-31 16:16:24 +03:00
Viacheslav Klimov
18083f1094 Merge remote-tracking branch 'zhenya/feature/queue-entity' into vc-improvements 2022-05-31 16:10:15 +03:00
Andrew Shvayka
e23dc2accb
Merge pull request #6615 from ViacheslavKlimov/vc-improvements
Export/import of attributes
2022-05-31 14:12:40 +03:00
Viacheslav Klimov
32f2f4ccd0 Export/import of attributes 2022-05-31 13:19:36 +03:00
Andrii Shvaika
bf03475987 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-31 13:19:28 +03:00
Andrii Shvaika
07b6813465 Separate AutoCommit settings 2022-05-31 13:19:16 +03:00
Igor Kulikov
bb9b58da5b Add author to entity version 2022-05-31 13:09:47 +03:00
Andrii Shvaika
518d9fd6f5 SID for Auto Version Create Config 2022-05-30 17:34:16 +03:00
Andrii Shvaika
34ac17ff83 Auto-commit draft 2022-05-30 17:32:13 +03:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +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
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
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
Igor Kulikov
65dc70c51b UI: Add entity versions text search support. Minor improvements and fixes. 2022-05-26 11:11:58 +03:00
ivankozka
b94b590e7c add version control queue factory realizations for other QueueFactories 2022-05-25 17:26:16 +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
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
YevhenBondarenko
b6cbe0ca77 added additional info to queue configutation 2022-05-24 12:02:43 +02: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
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
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
YevhenBondarenko
ee8c9deda9 refactoring 2022-05-19 23:55:16 +02:00
Andrii Shvaika
f2a8832489 Merge with main feature branch 2022-05-19 17:57:34 +03:00
Igor Kulikov
587066cfd3 Ability to remove version control settings 2022-05-19 13:19:43 +03:00