{{i18n.loginOrCreateNewAccount}}
- +{{i18n.loginOrCreateNewAccount}}
+diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index a060b480fb..08a64f6154 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -705,5 +705,29 @@ }, "emailDesc": { "message": "Verification codes will be emailed to you." + }, + "selfHostedEnvironment": { + "message": "Self-hosted Environment" + }, + "selfHostedEnvironmentFooter": { + "message": "Specify the base URL of your on-premise hosted bitwarden installation." + }, + "customEnvironment": { + "message": "Custom Environment" + }, + "customEnvironmentFooter": { + "message": "For advanced users. You can specify the base URL of each service independently." + }, + "baseUrl": { + "message": "Server URL" + }, + "apiUrl": { + "message": "API Server URL" + }, + "identityUrl": { + "message": "Identity Server URL" + }, + "environmentSaved": { + "message": "The environment URLs have been saved." } } diff --git a/src/background.js b/src/background.js index 37ea7b9d41..0a6b00d725 100644 --- a/src/background.js +++ b/src/background.js @@ -6,7 +6,7 @@ var bg_utilsService = new UtilsService(); var bg_cryptoService = new CryptoService(bg_constantsService); var bg_tokenService = new TokenService(); var bg_appIdService = new AppIdService(); -var bg_apiService = new ApiService(bg_tokenService, bg_appIdService, bg_utilsService, logout); +var bg_apiService = new ApiService(bg_tokenService, bg_appIdService, bg_utilsService, bg_constantsService, logout); var bg_userService = new UserService(bg_tokenService, bg_apiService, bg_cryptoService); var bg_settingsService = new SettingsService(bg_userService); var bg_loginService = new LoginService(bg_cryptoService, bg_userService, bg_apiService, bg_settingsService); diff --git a/src/popup/app/config.js b/src/popup/app/config.js index 7fbabf693b..1f0b5dbf10 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -90,27 +90,27 @@ data: { authorize: true }, params: { animation: null } }) - .state('tabs.current', { - url: '/current', - templateUrl: 'app/current/views/current.html', - controller: 'currentController' - }) - .state('tabs.vault', { - url: '/vault', - templateUrl: 'app/vault/views/vault.html', - controller: 'vaultController', - params: { syncOnLoad: false } - }) - .state('tabs.settings', { - url: '/settings', - templateUrl: 'app/settings/views/settings.html', - controller: 'settingsController' - }) - .state('tabs.tools', { - url: '/tools', - templateUrl: 'app/tools/views/tools.html', - controller: 'toolsController' - }) + .state('tabs.current', { + url: '/current', + templateUrl: 'app/current/views/current.html', + controller: 'currentController' + }) + .state('tabs.vault', { + url: '/vault', + templateUrl: 'app/vault/views/vault.html', + controller: 'vaultController', + params: { syncOnLoad: false } + }) + .state('tabs.settings', { + url: '/settings', + templateUrl: 'app/settings/views/settings.html', + controller: 'settingsController' + }) + .state('tabs.tools', { + url: '/tools', + templateUrl: 'app/tools/views/tools.html', + controller: 'toolsController' + }) .state('viewFolder', { url: '/view-folder?folderId', @@ -227,6 +227,13 @@ data: { authorize: true }, params: { animation: null } }) + .state('environment', { + url: '/environment', + templateUrl: 'app/settings/views/settingsEnvironment.html', + controller: 'settingsEnvironmentController', + data: { authorize: false }, + params: { animation: null } + }) .state('lock', { url: '/lock', templateUrl: 'app/lock/views/lock.html', diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html index d9436ccc46..b4b3f3e933 100644 --- a/src/popup/app/global/home.html +++ b/src/popup/app/global/home.html @@ -1,16 +1,17 @@ -
{{i18n.loginOrCreateNewAccount}}
- +{{i18n.loginOrCreateNewAccount}}
+