Browse Source

Merge branch 'devel' into meteor-1.8

Lauri Ojansivu 6 years ago
parent
commit
4f79e84399
5 changed files with 15 additions and 5 deletions
  1. 10 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 1 1
      models/export.js
  4. 1 1
      package.json
  5. 2 2
      sandstorm-pkgdef.capnp

+ 10 - 0
CHANGELOG.md

@@ -1,3 +1,13 @@
+# v2.14 2019-02-02 Wekan release
+
+- [Fix Sandstorm export board from web](https://github.com/wekan/wekan/issues/2157).
+- [Fix Error when logging in to Wekan REST API when using Sandstorm Wekan](https://github.com/wekan/wekan/issues/1279).
+  Sandstorm API works this way: Make API key, and from that key copy API URL and API KEY to below. It saves Wekan board to file.
+  `curl http://Bearer:APIKEY@api-12345.local.sandstorm.io:6080/api/boards/sandstorm/export?authToken=#APIKEY > wekanboard.json`
+  If later API key does not work, you need to remove it and make a new one.
+
+Thanks to GitHub user xet7 for contributions.
+
 # v2.13 2019-02-01 Wekan release
 
 This release adds the following new features with Apache I-CLA, thanks to bentiss:

+ 1 - 1
Stackerfile.yml

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

+ 1 - 1
models/export.js

@@ -31,7 +31,7 @@ if (Meteor.isServer) {
       user = Meteor.users.findOne({
         'services.resume.loginTokens.hashedToken': hashToken,
       });
-    } else {
+    } else if (!Meteor.settings.public.sandstorm) {
       Authentication.checkUserId(req.userId);
       user = Users.findOne({ _id: req.userId, isAdmin: true });
     }

+ 1 - 1
package.json

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

+ 2 - 2
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 = 215,
+    appVersion = 216,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.13.0~2019-02-01"),
+    appMarketingVersion = (defaultText = "2.14.0~2019-02-02"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,