Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-17 16:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'edge' into meteor-1.8

Browse source
This commit is contained in:
Lauri Ojansivu 2019-06-13 18:23:24 +03:00
commit 375fda0eff
9 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CHANGELOG.md
View file

@ -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 # v2.78 2019-06-12 Wekan release
This release fixes the following bugs: This release fixes the following bugs:

2
Dockerfile
View file

@ -41,7 +41,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
OAUTH2_USERNAME_MAP="" \ OAUTH2_USERNAME_MAP="" \
OAUTH2_FULLNAME_MAP="" \ OAUTH2_FULLNAME_MAP="" \
OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \ OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \
OAUTH2_REQUEST_PERMISSIONS='openid profiles email' \ OAUTH2_REQUEST_PERMISSIONS='openid profile email' \
OAUTH2_EMAIL_MAP="" \ OAUTH2_EMAIL_MAP="" \
LDAP_ENABLE=false \ LDAP_ENABLE=false \
LDAP_PORT=389 \ LDAP_PORT=389 \

2
Stackerfile.yml
View file

@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
appVersion: "v2.78.0" appVersion: "v2.80.0"
files: files:
userUploads: userUploads:
- README.md - README.md

2
docker-compose.yml
View file

@ -331,7 +331,7 @@ services:
# OAUTH2 ID Token Whitelist Fields. # OAUTH2 ID Token Whitelist Fields.
#- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
# OAUTH2 Request Permissions. # OAUTH2 Request Permissions.
#- OAUTH2_REQUEST_PERMISSIONS='openid profile email' #- OAUTH2_REQUEST_PERMISSIONS=openid profile email
# OAuth2 ID Mapping # OAuth2 ID Mapping
#- OAUTH2_ID_MAP= #- OAUTH2_ID_MAP=
# OAuth2 Username Mapping # OAuth2 Username Mapping

4
i18n/tr.i18n.json
View file

@ -687,7 +687,7 @@
"people-number": "The number of people is:", "people-number": "The number of people is:",
"swimlaneDeletePopup-title": "Kulvar silinsin mi?", "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.", "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", "delete-all": "Hepsini sil",
"loading": "Loading, please wait." "loading": "Yükleniyor, lütfen bekleyiniz"
} }

2
package.json
View file

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

4
sandstorm-pkgdef.capnp
View file

@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Wekan"), appTitle = (defaultText = "Wekan"),
# The name of the app as it is displayed to the user. # The name of the app as it is displayed to the user.
appVersion = 280, appVersion = 282,
# Increment this for every release. # 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. # Human-readable presentation of the app version.
minUpgradableAppVersion = 0, minUpgradableAppVersion = 0,

2
server/authentication.js
View file

@ -76,7 +76,7 @@ Meteor.startup(() => {
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT, authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT, userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_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, requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS,
}, },
// OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [], // OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],

2
snap-src/bin/config
View file

@ -175,7 +175,7 @@ DEFAULT_OAUTH2_FULLNAME_MAP=""
KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map" KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map"
DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="OAuth2 ID Token Whitelist Fields. Example: []" 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" KEY_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="oauth2-id-token-whitelist-fields"
DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: 'openid profile email'" DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: 'openid profile email'"