Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v1.86 2018-12-13 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:

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__",

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

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__ импортирована",

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;
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v1.85.0",
+  "version": "v1.86.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 = 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,