diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-07-06 15:35:14 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-07-06 15:35:14 +0300 |
| commit | 09dbcf3bea833229d51319f318565b64d9647b6d (patch) | |
| tree | e0d4a430cf3133521ff02cba6c775a10afab78a4 | |
| parent | 5e17b01077b9bb0dc8ed91815a23fd58f970ed08 (diff) | |
| parent | 369da1e09dd8756b7be22d3d63aa22f995712f16 (diff) | |
| download | wekan-09dbcf3bea833229d51319f318565b64d9647b6d.tar.gz wekan-09dbcf3bea833229d51319f318565b64d9647b6d.tar.bz2 wekan-09dbcf3bea833229d51319f318565b64d9647b6d.zip | |
Merge branch 'devel'
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | client/components/boards/boardHeader.jade | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
4 files changed, 16 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ca7bcdbb..dc26d9d5 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index a4abfac6..1c6c8f8c 100644 --- a/client/components/boards/boardHeader.jade +++ b/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 diff --git a/package.json b/package.json index fe45137b..d2e5d0a0 100644 --- a/package.json +++ b/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": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c9630158..8624d596 100644 --- a/sandstorm-pkgdef.capnp +++ b/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, |