Merge branch 'edge' into meteor-1.8

9 files changed, 26 insertions, 10 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3fc0d64..95cb1a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 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:
+
+- [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:
diff --git a/Dockerfile b/Dockerfile
index 032beed6..d3949e00 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/Stackerfile.yml b/Stackerfile.yml
index ef8860d3..47bee6c9 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.80.0"
 files:
   userUploads:
     - README.md
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ab6cd69..71c652cb 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
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index bd8c9737..4fdcbaef 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
diff --git a/package.json b/package.json
index 538cef21..223a3a7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.78.0",
+  "version": "v2.80.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index b5e34d4f..0de7dfb2 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 = 282,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.78.0~2019-06-12"),
+    appMarketingVersion = (defaultText = "2.80.0~2019-06-13"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/server/authentication.js b/server/authentication.js
index b1e7f8ec..217647bd 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 || [],
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 6d86339b..8c027ce1 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'"