bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext

Browse Source 
# Conflicts:
#	src/browser/safariApp.ts
#	src/safari/safari/SafariExtensionViewController.swift
#	src/services/browserPlatformUtils.service.ts
This commit is contained in:
Hinton
2021-01-13 14:21:45 +01:00
parent 303439533c 7e41e84c7d
commit db59f2791a
21 changed files with 202 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/background/runtime.background.ts
View File

@@ -455,7 +455,7 @@ export default class RuntimeBackground {
if (policy.enabled) {
const org = await this.userService.getOrganization(policy.organizationId);
if (org != null && org.enabled && org.usePolicies && !org.isAdmin
&& org.status == OrganizationUserStatusType.Confirmed) {
&& org.status === OrganizationUserStatusType.Confirmed) {
return false;
}
}