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

1070 Commits

Author SHA1 Message Date
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
Andrii Shvaika
54e3884334 Version load error and 'exportCredentials' setting support 2022-06-01 16:55:38 +03:00
Andrii Shvaika
5a0eb8b640 Ordering and localization 2022-06-01 13:56:35 +03:00
YevhenBondarenko
0bf8749ca5 fixed race condition during queue creating 2022-06-01 12:05:00 +02:00
Viacheslav Klimov
4c8b3bd7cb Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements 2022-06-01 12:45:33 +03:00
Andrii Shvaika
ac0b1a9879 getEntityDataInfo API call 2022-05-31 17:46:23 +03:00
Viacheslav Klimov
1610222b72 Export/import api rate limiting 2022-05-31 17:27:53 +03:00
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
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
Igor Kulikov
65dc70c51b UI: Add entity versions text search support. Minor improvements and fixes. 2022-05-26 11:11:58 +03:00
Andrii Shvaika
5bb9bdface Cache for VersionControlSettings 2022-05-25 13:43:35 +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
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
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
Igor Kulikov
cd30e9a4b1 Fix merge conflicts 2022-05-19 12:31:00 +03: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
YevhenBondarenko
7f31069285 added loging and refactored 2022-05-18 13:51:51 +02:00
Viacheslav Klimov
866ad82187 Email 2FA verification message improvements 2022-05-18 12:50:12 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00
Viacheslav Klimov
d3863de094 Remove platform 2FA settings for tenant authority 2022-05-17 18:45:11 +03:00
Viacheslav Klimov
41fede9b43 Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template 2022-05-17 18:31:49 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
YevhenBondarenko
d5ef34cfb8 added additional info to Queue 2022-05-10 19:44:58 +02:00
YevhenBondarenko
dc3c2cfec2 merge with develop/3.4 2022-05-09 22:27:21 +02:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Viacheslav Klimov
4480badd78 Email 2FA provider; 2FA API improvements 2022-05-05 18:08:54 +03:00