Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,10 +1,17 @@
-# Upcoming Wekan release
+# v2.10 2019-01-30 Wekan release
 
 This release adds the following new features:
 
-- Translations: Add Macedonian.
+- Translations: Add Macedonian. [Copied Bulgarian to Macedonian](https://github.com/wekan/wekan/commit/6e4a6515e00fe68b8615d850cfb3cb290418e176)
+  so that required changes will be faster to add. Thanks to translators and therampagerado.
 
-Thanks to translators.
+and fixes the following bugs:
+
+- Revert [Sandstorm API changes](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535
+  that were done at [Wekan v2.05](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v205-2019-01-27-wekan-release)
+  to fix #2143. Thanks to pantraining and xet7.
+
+Thanks to above GitHub users and translators for contributions.
 
 # v2.09 2019-01-28 Wekan release
 

Stackerfile.yml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.09.0",
+  "version": "v2.10.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 = 211,
+    appVersion = 212,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.09.0~2019-01-28"),
+    appMarketingVersion = (defaultText = "2.10.0~2019-01-30"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
@@ -226,7 +226,7 @@ const pkgdef :Spk.PackageDefinition = (
         verbPhrase = (defaultText = "removed from card"),
       ), ],
     ),
-    apiPath = "/api",
+    apiPath = "/",
     saveIdentityCaps = true,
   ),
 );

server/authentication.js

@@ -16,27 +16,6 @@ Meteor.startup(() => {
   Authentication = {};
 
   Authentication.checkUserId = function (userId) {
-    if (userId === undefined) {
-      // Monkey patch to work around the problem described in
-      // https://github.com/sandstorm-io/meteor-accounts-sandstorm/pull/31
-      const _httpMethods = HTTP.methods;
-      HTTP.methods = (newMethods) => {
-        Object.keys(newMethods).forEach((key) =>  {
-          if (newMethods[key].auth) {
-            newMethods[key].auth = function() {
-              const sandstormID = this.req.headers['x-sandstorm-user-id'];
-              const user = Meteor.users.findOne({'services.sandstorm.id': sandstormID});
-              if (user) {
-                userId = user._id;
-              }
-              //return user && user._id;
-            };
-          }
-        });
-        _httpMethods(newMethods);
-      };
-    }
-
     if (userId === undefined) {
       const error = new Meteor.Error('Unauthorized', 'Unauthorized');
       error.statusCode = 401;