From eb49bb5e109aa867266b7f32200e5173f89977ea Mon Sep 17 00:00:00 2001 From: Dominik Pfeifer Date: Wed, 12 Jun 2019 13:41:10 +0200 Subject: [PATCH 1/7] fix oauth2 typos in dockerfile & compose --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bef829298..23aa15023 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth OAUTH2_USERNAME_MAP="" \ OAUTH2_FULLNAME_MAP="" \ OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \ - OAUTH2_REQUEST_PERMISSIONS='openid profiles email' \ + OAUTH2_REQUEST_PERMISSIONS='openid profile email' \ OAUTH2_EMAIL_MAP="" \ LDAP_ENABLE=false \ LDAP_PORT=389 \ diff --git a/docker-compose.yml b/docker-compose.yml index 8f1e057f9..500efc274 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -331,7 +331,7 @@ services: # OAUTH2 ID Token Whitelist Fields. #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] # OAUTH2 Request Permissions. - #- OAUTH2_REQUEST_PERMISSIONS='openid profile email' + #- OAUTH2_REQUEST_PERMISSIONS=openid profile email # OAuth2 ID Mapping #- OAUTH2_ID_MAP= # OAuth2 Username Mapping From 02c418f4bb6b01bef45f77022a1be6d6b2ee18e2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jun 2019 19:05:29 +0300 Subject: [PATCH 2/7] Update changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3fc0d645..2ee94e43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix OAuth2 typos in Dockerfile and docker-compose.yml](https://github.com/wekan/wekan/pull/2488). + Thanks to DominikPf. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.78 2019-06-12 Wekan release This release fixes the following bugs: From 34b7bfd19cfa0f62fe20dbc850f6d8b3606929cb Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jun 2019 19:07:31 +0300 Subject: [PATCH 3/7] Update translations. --- i18n/tr.i18n.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index bd8c97372..4fdcbaefb 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -687,7 +687,7 @@ "people-number": "The number of people is:", "swimlaneDeletePopup-title": "Kulvar silinsin mi?", "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.", - "restore-all": "Restore all", + "restore-all": "Her şeyi eski haline getir", "delete-all": "Hepsini sil", - "loading": "Loading, please wait." + "loading": "Yükleniyor, lütfen bekleyiniz" } \ No newline at end of file From 1178a48e68fcb99b538e5af33af69fe30b57e0ac Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Jun 2019 11:03:45 +0300 Subject: [PATCH 4/7] Add back [OAuth2 idTokenWhitelistFields default empty array](https://github.com/wekan/wekan/commit/8b31c0768c34fc4557b54cec936a0b4288a8e722#commitcomment-33921882). Thanks to moserben16 ! --- server/authentication.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/authentication.js b/server/authentication.js index b1e7f8ecf..217647bd1 100644 --- a/server/authentication.js +++ b/server/authentication.js @@ -76,7 +76,7 @@ Meteor.startup(() => { authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT, userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT, tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT, - idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS, + idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [], requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS, }, // OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [], From 291797b23810d00433beeecd3c4c007b9413fe82 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Jun 2019 18:14:43 +0300 Subject: [PATCH 5/7] v2.79 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee94e43e..05472ef97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.79 2019-06-13 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index ef8860d36..ad65e0536 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.78.0" +appVersion: "v2.79.0" files: userUploads: - README.md diff --git a/package.json b/package.json index eefc1cc0c..928280be0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.78.0", + "version": "v2.79.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index b5e34d4fd..5f6b90b23 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 280, + appVersion = 281, # Increment this for every release. - appMarketingVersion = (defaultText = "2.78.0~2019-06-12"), + appMarketingVersion = (defaultText = "2.79.0~2019-06-13"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, From 44dbd462b19e613fcb47161d44e4046d5d91a319 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Jun 2019 18:18:03 +0300 Subject: [PATCH 6/7] Default whitelist array, not string. Thanks to xet7 ! --- snap-src/bin/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap-src/bin/config b/snap-src/bin/config index 6d86339ba..8c027ce11 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -175,7 +175,7 @@ DEFAULT_OAUTH2_FULLNAME_MAP="" KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map" DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="OAuth2 ID Token Whitelist Fields. Example: []" -DEFAULT_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="[]" +DEFAULT_OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] KEY_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="oauth2-id-token-whitelist-fields" DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: 'openid profile email'" From ed04769947d83000cc7654663c94e8062fee9ad9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Jun 2019 18:21:51 +0300 Subject: [PATCH 7/7] v2.80 --- CHANGELOG.md | 7 +++++++ Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05472ef97..95cb1a7fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v2.80 2019-06-13 Wekan release + +- [Fix OAuth2 typos in snap-src/bin/config](https://github.com/wekan/wekan/commit/44dbd462b19e613fcb47161d44e4046d5d91a319). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.79 2019-06-13 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index ad65e0536..47bee6c99 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.79.0" +appVersion: "v2.80.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 928280be0..c30703c73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.79.0", + "version": "v2.80.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 5f6b90b23..0de7dfb24 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 281, + appVersion = 282, # Increment this for every release. - appMarketingVersion = (defaultText = "2.79.0~2019-06-13"), + appMarketingVersion = (defaultText = "2.80.0~2019-06-13"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,