diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-06-13 19:31:02 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-06-13 19:31:02 +0300 |
| commit | 434fa3226af0d4857b991b805dc26141f5956e5d (patch) | |
| tree | cd8e553705b374fde67e96db51bf0ae5e49ea397 | |
| parent | e689feddcb3edf4597f8dc1dade18b438ac18631 (diff) | |
| parent | f9abfe52442f0855b9cb94af56ad9fc13e5a88e3 (diff) | |
| download | wekan-434fa3226af0d4857b991b805dc26141f5956e5d.tar.gz wekan-434fa3226af0d4857b991b805dc26141f5956e5d.tar.bz2 wekan-434fa3226af0d4857b991b805dc26141f5956e5d.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rwxr-xr-x | snap-src/bin/config | 4 | ||||
| -rwxr-xr-x | snap-src/bin/wekan-help | 2 |
6 files changed, 17 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 12427f85..42379e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# v2.81 2019-06-13 Wekan release + +This release fixes the following bugs: + +- [Change OAuth2 whitelist default to empty string at snap, so it would be used as array on + wekan/server/authentication.js](https://github.com/wekan/wekan/commit/4334fbbb9dacf45b0262019526a9697b015049a1). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.80 2019-06-13 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 47bee6c9..aeed7542 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.80.0" +appVersion: "v2.81.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 223a3a7e..08e5c5f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.80.0", + "version": "v2.81.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0de7dfb2..2a226a08 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 = 282, + appVersion = 283, # Increment this for every release. - appMarketingVersion = (defaultText = "2.80.0~2019-06-13"), + appMarketingVersion = (defaultText = "2.81.0~2019-06-13"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snap-src/bin/config b/snap-src/bin/config index 8c027ce1..257576c3 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -174,8 +174,8 @@ DESCRIPTION_OAUTH2_FULLNAME_MAP="OAuth2 Fullname Mapping. Example: name" 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=[] +DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="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'" diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index f8509d4c..546399b6 100755 --- a/snap-src/bin/wekan-help +++ b/snap-src/bin/wekan-help @@ -142,7 +142,7 @@ echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint=''" echo -e "\n" echo -e "OAuth2 ID Token Whitelist Fields." echo -e "To enable the OAuth2 ID Token Whitelist Fields of Wekan:" -echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields='[]'" +echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields=[]" echo -e "\t-Disable the OAuth2 ID Token Whitelist Fields of Wekan:" echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields=''" echo -e "\n" |