Merge branch 'edge' into meteor-1.8

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:

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.80.0",
+  "version": "v2.81.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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,

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'"

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"