From 7b127c82541f29e4df5c068287d3f210f976f015 Mon Sep 17 00:00:00 2001 From: Aulon Mujaj Date: Mon, 1 Mar 2021 17:17:06 +0100 Subject: [PATCH] release: 2.0.0-rc.5 --- CHANGELOG.md | 4 ++++ README.md | 3 ++- package.json | 2 +- src/locale/locales/en-US.json | 1 + src/locale/locales/nb-NO.json | 1 + src/views/Login.vue | 9 ++++++++- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e208a6d7..8c5f3cbb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,13 @@ All notable changes to this project will be documented in this file. The format ## Unreleased +## [2.0.0-rc.5] 2021-03-01 + ### Added - Dev-environment for users outside of Oslo kommune to test our application before forking/using - Show User UID in profile +- Custom personalized sign in text for the keycloak sign-in button (default is `Sign in with keycloak`, new environment variable) # Fixed @@ -48,6 +51,7 @@ All notable changes to this project will be documented in this file. The format ## [2.0.0-rc.3] 2021-01-26 ### BREAKING CHANGE + - Drop IE 11 support ### Added diff --git a/README.md b/README.md index 2172ec2ba..1a285dab9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ If you would like to check out how the application works, you can go to the demo-site and sign in with a test-user -- Site: https://origo-okr-tracker.web.app +- Site: https://origo-okr-tracker.web.app - User/pass: testuser@okr.com / testuser ## Project requirements @@ -114,6 +114,7 @@ Get your Firebase SDK snippet from your [Firebase Console](https://console.fireb | `VUE_APP_KEYCLOAK_CLIENT_ID` | _from keycloak server_ (if keycloak provided to `VUE_APP_LOGIN_PROVIDERS`) | | `VUE_APP_KEYCLOAK_LOGOUT_URL` | Where to redirect user after sign out (if keycloak provided to `VUE_APP_LOGIN_PROVIDERS`) | | `VUE_APP_KEYCLOAK_ERROR_URL` | Where to redirect user when error signing in (if keycloak provided to `VUE_APP_LOGIN_PROVIDERS`) | +| `VUE_APP_KEYCLOAK_SIGN_IN_TEXT` | A specialized text if you want the keycloak sign in button to say something else than 'keycloak' | ### Link project diff --git a/package.json b/package.json index 53b74b970..1fa707ada 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "okr-tracker", - "version": "2.0.0-rc.4", + "version": "2.0.0-rc.5", "private": true, "scripts": { "dev": "firebase emulators:start --import=./mock & vue-cli-service serve", diff --git a/src/locale/locales/en-US.json b/src/locale/locales/en-US.json index 43a9eb633..ce8371260 100644 --- a/src/locale/locales/en-US.json +++ b/src/locale/locales/en-US.json @@ -129,6 +129,7 @@ "requestAccess": "Request access", "requestButton": "Send request", "backToLogin": "Back to login", + "with": "Sign in with {provider} user", "google": "Sign in with Google", "keycloak": "Sign in with Keycloak", "email": "Email", diff --git a/src/locale/locales/nb-NO.json b/src/locale/locales/nb-NO.json index cb3fb6fb2..a45a02aa2 100644 --- a/src/locale/locales/nb-NO.json +++ b/src/locale/locales/nb-NO.json @@ -127,6 +127,7 @@ "requestAccess": "Be om tilgang", "requestButton": "Send forespørsel", "backToLogin": "Tilbake til innlogging", + "with": "Logg inn med {provider} bruker", "google": "Logg inn med Google", "keycloak": "Logg inn med Keycloak", "email": "E-post", diff --git a/src/views/Login.vue b/src/views/Login.vue index f5900914f..00ce3dda5 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -61,7 +61,7 @@ data-cy="login-username" @click="loginWithKeycloak" > - {{ $t('login.keycloak') }} + {{ getKeycloakText }}