summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-06-27 23:38:58 +0300
committerLauri Ojansivu <x@xet7.org>2018-06-27 23:38:58 +0300
commited0ef5b7d348df3fd1671ac44bfc8be41a296514 (patch)
treef95d30647dc0fa6babe9869a4769bf8217642deb
parent864ad3827d07653f489fc6b5ae87e6e81af7dd81 (diff)
parent5619eef6202f3c6f0f483310676724e89ee89632 (diff)
downloadwekan-ed0ef5b7d348df3fd1671ac44bfc8be41a296514.tar.gz
wekan-ed0ef5b7d348df3fd1671ac44bfc8be41a296514.tar.bz2
wekan-ed0ef5b7d348df3fd1671ac44bfc8be41a296514.zip
Merge branch 'TNick-invitation-code-setting' into devel
-rw-r--r--CHANGELOG.md11
-rw-r--r--client/components/settings/invitationCode.js2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67bf5d07..e261c68e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* To fix ["title is required"](https://github.com/wekan/wekan/issues/1576) fix only
+ add-checklist-items and revert all other migration changes](https://github.com/wekan/wekan/issues/1734);
+* [Restore invitation code logic](https://github.com/wekan/wekan/pull/1732). Please test and add comment
+ to those invitation code issues that this fixes.
+
+Thanks to GitHub users TNick and xet7 for their contributions.
+
# v1.08 2018-06-27 Wekan release
This release adds the following new features:
diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js
index c02f860f..a403d8ab 100644
--- a/client/components/settings/invitationCode.js
+++ b/client/components/settings/invitationCode.js
@@ -1,6 +1,6 @@
Template.invitationCode.onRendered(() => {
const setting = Settings.findOne();
- if (setting || setting.disableRegistration) {
+ if (!setting || !setting.disableRegistration) {
$('#invitationcode').hide();
}
});