1
0
mirror of https://github.com/bitwarden/web synced 2025-12-06 00:03:28 +00:00

Compare commits

...

11 Commits

Author SHA1 Message Date
gbubemismith
8417770dcd changed implementation 2022-05-27 12:11:47 +01:00
gbubemismith
9c60151102 fixed comments 2022-05-27 00:35:49 +01:00
gbubemismith
a37f585a72 Merge branch 'master' into bug/PS-250-custom-timeout-to-immediately 2022-05-26 14:11:43 +01:00
gbubemismith
b2ca1ac651 suggestion fixes 2022-05-26 14:08:59 +01:00
gbubemismith
22b41df8b9 changed implementation 2022-05-26 01:01:42 +01:00
gbubemismith
b882997ee1 remove unused reference 2022-05-25 01:03:24 +01:00
gbubemismith
a4ff1bb8b4 do not allow timeout less than 1 minute 2022-05-25 01:01:37 +01:00
gbubemismith
323642c2f5 Merge branch 'master' into bug/PS-250-custom-timeout-to-immediately 2022-05-24 11:37:45 +01:00
gbubemismith
2eaa29f6f7 Merge branch 'master' into bug/PS-250-custom-timeout-to-immediately 2022-05-13 12:50:16 +01:00
gbubemismith
b299035e05 removed unused reference 2022-05-13 12:28:25 +01:00
gbubemismith
c936c7a9c1 Modified should lock functionality to handle the immediately valut timeout 2022-05-12 21:38:07 +01:00
4 changed files with 15 additions and 2 deletions

View File

@@ -23,7 +23,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
import { StateService } from "jslib-common/abstractions/state.service";
import { SyncService } from "jslib-common/abstractions/sync.service";
import { TokenService } from "jslib-common/abstractions/token.service";
import { CipherType } from "jslib-common/enums/cipherType";
import { CipherView } from "jslib-common/models/view/cipherView";
import { UpdateKeyComponent } from "../../../../settings/update-key.component";

View File

@@ -83,7 +83,11 @@ export class PreferencesComponent implements OnInit {
async submit() {
if (!this.vaultTimeout.valid) {
this.platformUtilsService.showToast("error", null, this.i18nService.t("vaultTimeoutToLarge"));
this.platformUtilsService.showToast(
"error",
null,
this.i18nService.t("vaultTimeoutRangeError")
);
return;
}

View File

@@ -41,5 +41,9 @@
<small>{{ "minutes" | i18n }}</small>
</div>
</div>
<small *ngIf="!exceedsMinimumTimout" class="tw-text-danger">
<i class="bwi bwi-error" aria-hidden="true"></i> {{ "vaultCustomTimeoutMinimum" | i18n }}
</small>
</div>
</div>

View File

@@ -4431,6 +4431,12 @@
"vaultTimeoutToLarge": {
"message": "Your vault timeout exceeds the restriction set by your organization."
},
"vaultCustomTimeoutMinimum": {
"message": "Minimum custom timeout is 1 minute."
},
"vaultTimeoutRangeError": {
"message": "Vault Timeout is not within allowed range."
},
"disablePersonalVaultExport": {
"message": "Disable Personal Vault Export"
},