Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v2.05 2019-01-27 Wekan release
+
+This release fixes the following bugs partially:
+
+- Add back scrollbars that [were hidden when trying to fix another
+  bug](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb).
+  This makes scrollbars work in Chromium/Chrome, but adds back bug to Firefox
+  that cards are below of swimlane title.
+- [Try to have some progress on Wekan Sandstorm API](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535).
+  I did not get it fully working yet.
+
+Thanks to GitHub user xet7 for contributions.
+
 # v2.04 2019-01-26 Wekan release
 
 This release fixes the following bugs with Apache I-CLA, thanks to bentiss:

Stackerfile.yml

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

client/components/swimlanes/swimlanes.styl

@@ -53,7 +53,6 @@
 .list-group
   flex-direction: row
   height: 100%
-  overflow: hidden
 
 swimlane-color(background, color...)
   background: background !important

i18n/zh-CN.i18n.json

@@ -335,10 +335,10 @@
     "list-archive-cards-pop": "将移动看板中列表的所有卡片，查看或回复归档中的卡片，点击“菜单”->“归档”",
     "list-move-cards": "移动列表中的所有卡片",
     "list-select-cards": "选择列表中的所有卡片",
-    "set-color-list": "Set Color",
+    "set-color-list": "设置颜色",
     "listActionPopup-title": "列表操作",
     "swimlaneActionPopup-title": "泳道图操作",
-    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "swimlaneAddPopup-title": "在下面添加一个泳道",
     "listImportCardPopup-title": "导入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "关联到这个列表",
@@ -520,9 +520,9 @@
     "editCardReceivedDatePopup-title": "修改接收日期",
     "editCardEndDatePopup-title": "修改终止日期",
     "setCardColorPopup-title": "设置颜色",
-    "setCardActionsColorPopup-title": "Choose a color",
-    "setSwimlaneColorPopup-title": "Choose a color",
-    "setListColorPopup-title": "Choose a color",
+    "setCardActionsColorPopup-title": "选择一种颜色",
+    "setSwimlaneColorPopup-title": "选择一种颜色",
+    "setListColorPopup-title": "选择一种颜色",
     "assigned-by": "分配人",
     "requested-by": "需求人",
     "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.04.0",
+  "version": "v2.05.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 = 206,
+    appVersion = 207,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.04.0~2019-01-26"),
+    appMarketingVersion = (defaultText = "2.05.0~2019-01-27"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
@@ -226,7 +226,7 @@ const pkgdef :Spk.PackageDefinition = (
         verbPhrase = (defaultText = "removed from card"),
       ), ],
     ),
-    apiPath = "/",
+    apiPath = "/api",
     saveIdentityCaps = true,
   ),
 );

server/authentication.js

@@ -16,6 +16,27 @@ 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;