Merge branch 'devel'

CHANGELOG.md

@@ -1,5 +1,15 @@
+# v1.17 2018-07-06 Wekan release
+
+This release adds the following new features:
+
+- [Made Subtask Settings visible at Board menu at Sandstorm](https://github.com/wekan/wekan/commit/884cd0e6b888edc9752cbed80e7ac75e2ce232de).
+
+Thanks to GitHub user xet7 for contributions.
+
 # v1.16 2018-07-06 Wekan release
 
+This release fixes the following bugs:
+
 - Fix: [Boards.forEach is not function](https://github.com/wekan/wekan/commit/a41190cdf024df65ad1c9931b3065c6ababeaf25).
 
 Thanks to GitHub user xet7 for contributions.

client/components/boards/boardHeader.jade

@@ -139,6 +139,9 @@ template(name="boardMenuPopup")
     ul.pop-over-list
       li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
       li: a.js-import-board {{_ 'import-board-c'}}
+    hr
+    ul.pop-over-list
+      li: a.js-subtask-settings {{_ 'subtask-settings'}}
 
 template(name="boardVisibilityList")
   ul.pop-over-list

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "The open-source Trello-like 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 = 101,
+    appVersion = 102,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.16.0~2018-07-06"),
+    appMarketingVersion = (defaultText = "1.17.0~2018-07-06"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,