Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,14 @@
+# v2.67 2019-05-10 Wekan release
+
+This release adds the following new features:
+
+- [Move board to Archive button at each board at All Boards page](https://github.com/wekan/wekan/commit/828f6ea321020eda77fea399df52889e2081dfac).
+  Thanks to xet7. Related #2389
+- [If adding Subtasks does not work on old board, added wiki page how to make it work again](https://github.com/wekan/wekan/wiki/Subtasks).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.66 2019-05-09 Wekan release
 
 This release adds the following new features:

Stackerfile.yml

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

client/components/boards/boardsList.jade

@@ -30,8 +30,9 @@ template(name="boardList")
                 i.fa.js-clone-board(
                     class="fa-clone"
                     title="{{_ 'duplicate-board'}}")
-
-
+                i.fa.js-archive-board(
+                    class="fa-archive"
+                    title="{{_ 'archive-board'}}")
 
 template(name="boardListHeaderBar")
   h1 {{_ 'my-boards'}}

client/components/boards/boardsList.js

@@ -70,6 +70,11 @@ BlazeComponent.extendComponent({
         );
         evt.preventDefault();
       },
+      'click .js-archive-board'(evt) {
+        const boardId = this.currentData()._id;
+        Meteor.call('archiveBoard', boardId);
+        evt.preventDefault();
+      },
       'click .js-accept-invite'() {
         const boardId = this.currentData()._id;
         Meteor.user().removeInvite(boardId);

client/components/boards/boardsList.styl

@@ -106,15 +106,29 @@ $spaceBetweenTiles = 16px
     transition-duration: .15s
     transition-property: color, font-size, background
 
+  .fa-archive
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    left: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
   li:hover a
     &:hover
       .fa-star,
       .fa-clone,
+      .fa-archive,
       .fa-star-o
         color: white
 
     .fa-star,
     .fa-clone,
+    .fa-archive,
     .fa-star-o
       color: white
       opacity: .75

models/boards.js

@@ -867,6 +867,22 @@ if (Meteor.isServer) {
       } else throw new Meteor.Error('error-board-doesNotExist');
     },
   });
+
+  Meteor.methods({
+    archiveBoard(boardId) {
+      check(boardId, String);
+      const board = Boards.findOne(boardId);
+      if (board) {
+        const userId = Meteor.userId();
+        const index = board.memberIndex(userId);
+        if (index >= 0) {
+          board.archive();
+          return true;
+        } else throw new Meteor.Error('error-board-notAMember');
+      } else throw new Meteor.Error('error-board-doesNotExist');
+    },
+  });
+
 }
 
 if (Meteor.isServer) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.66.0",
+  "version": "v2.67.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 = 268,
+    appVersion = 269,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.66.0~2019-05-09"),
+    appMarketingVersion = (defaultText = "2.67.0~2019-05-10"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,