From 2ae143e6dafd9bbaf212d8a0c1149732980b92a2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Dec 2018 14:10:55 +0200 Subject: [PATCH 1/4] Update translations. --- i18n/es.i18n.json | 6 +++--- i18n/pl.i18n.json | 2 +- i18n/ru.i18n.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 4e07c15de..db20897be 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -11,9 +11,9 @@ "act-createCustomField": "creado el campo personalizado __customField__", "act-createList": "ha añadido __list__ a __board__", "act-addBoardMember": "ha añadido a __member__ a __board__", - "act-archivedBoard": "__board__ moved to Archive", - "act-archivedCard": "__card__ moved to Archive", - "act-archivedList": "__list__ moved to Archive", + "act-archivedBoard": "__board__ movido al Archivo", + "act-archivedCard": "__card__ movida al Archivo", + "act-archivedList": "__list__ movida a Archivo", "act-archivedSwimlane": "__swimlane__ moved to Archive", "act-importBoard": "ha importado __board__", "act-importCard": "ha importado __card__", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 8132a50d0..b98882be5 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -618,5 +618,5 @@ "authentication-type": "Typ autoryzacji", "custom-product-name": "Niestandardowa nazwa produktu", "layout": "Układ strony", - "hide-logo": "Hide Logo" + "hide-logo": "Ukryj logo" } \ No newline at end of file diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index b7016399c..67de85518 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -12,7 +12,7 @@ "act-createList": "добавил __list__ на __board__", "act-addBoardMember": "добавил __member__ на __board__", "act-archivedBoard": "Доска __board__ перемещена в архив", - "act-archivedCard": "Карточка __card__ перемещена в архив", + "act-archivedCard": "Карточка __card__ перемещена в Архив", "act-archivedList": "Список __list__ перемещён в архив", "act-archivedSwimlane": "Дорожка __swimlane__ перемещена в архив", "act-importBoard": "__board__ импортирована", From f8ef8507b5620cee6df73d1cd38df72d18db48e6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Dec 2018 14:27:34 +0200 Subject: [PATCH 2/4] - Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29); - Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32). Thanks to Akuket ! Closes wekan/wekan-ldap#29, closes wekan/wekan-ldap#32 --- models/users.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/models/users.js b/models/users.js index 2e879d942..90ae8bf64 100644 --- a/models/users.js +++ b/models/users.js @@ -520,10 +520,14 @@ if (Meteor.isServer) { } const disableRegistration = Settings.findOne().disableRegistration; + // If this is the first Authentication by the ldap and self registration disabled + if (disableRegistration && options.ldap) { + user.authenticationMethod = 'ldap'; + return user; + } + + // If self registration enabled if (!disableRegistration) { - if (options.ldap) { - user.authenticationMethod = 'ldap'; - } return user; } From 5f4e2d8e06514d0442785bac6b0d6aa014c37f60 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Dec 2018 14:34:11 +0200 Subject: [PATCH 3/4] - Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29); - Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32). Thanks to Akuket ! --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17c39fb54..086da18ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29); +- Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32). + +Thanks to GitHub user Akuket for contributions. + # v1.85 2018-12-09 Wekan release This release fixes the following bugs: From 4b7d47465acf5c435f8e13810328bd8effedc1e3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Dec 2018 14:40:16 +0200 Subject: [PATCH 4/4] v1.86 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 086da18ae..c28a70bf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.86 2018-12-13 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 9e8e854a3..b4dd44617 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.85.0", + "version": "v1.86.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index dc9cca9de..4034276df 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 = 187, + appVersion = 188, # Increment this for every release. - appMarketingVersion = (defaultText = "1.85.0~2018-12-09"), + appMarketingVersion = (defaultText = "1.86.0~2018-12-13"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,