summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md8
-rw-r--r--models/users.js14
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
4 files changed, 11 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae70f8e4..fc4c12fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.41 2017-09-25 Wekan release
+
+This release fixes the following bugs:
+
+* [Can't create user and login after install. Reverting REST API: Create user despite disabling registration](https://github.com/wekan/wekan/issues/1249).
+
+Thanks to GitHub user xet7 for contributions.
+
# v0.40 2017-09-25 Wekan release
This release adds the following new features:
diff --git a/models/users.js b/models/users.js
index 505ed93e..c2238cde 100644
--- a/models/users.js
+++ b/models/users.js
@@ -108,10 +108,6 @@ Users.attachSchema(new SimpleSchema({
type: Boolean,
optional: true,
},
- fromAdmin: {
- type: Boolean,
- optional: false,
- },
}));
// Search a user in the complete server database by its name or username. This
@@ -439,12 +435,6 @@ if (Meteor.isServer) {
user.isAdmin = true;
return user;
}
-
- if (options.from === 'admin') {
- user.fromAdmin = true;
- return user;
- }
-
const disableRegistration = Settings.findOne().disableRegistration;
if (!disableRegistration) {
return user;
@@ -534,9 +524,6 @@ if (Meteor.isServer) {
Users.after.insert((userId, doc) => {
- if (doc.fromAdmin)
- return;
-
//invite user to corresponding boards
const disableRegistration = Settings.findOne().disableRegistration;
if (disableRegistration) {
@@ -595,7 +582,6 @@ if (Meteor.isServer) {
username: req.body.username,
email: req.body.email,
password: 'default',
- from: 'admin',
});
JsonRoutes.sendResult(res, {
diff --git a/package.json b/package.json
index 8025199b..8a32b28a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "0.40.0",
+ "version": "0.41.0",
"description": "The open-source Trello-like kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index c8940a94..aa5fe05d 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 = 27,
+ appVersion = 28,
# Increment this for every release.
- appMarketingVersion = (defaultText = "0.40.0~2017-09-25"),
+ appMarketingVersion = (defaultText = "0.41.0~2017-09-25"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,