summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-10-31 05:59:04 +0200
committerLauri Ojansivu <x@xet7.org>2017-10-31 05:59:04 +0200
commitaa1646ad45de5877f193c6dd1734901827ef77d7 (patch)
tree4b7341bc461979ed4522f9dab56a2819b6e7d506
parent01507576b1c3c3ad148969691d1e22bf7addbeb9 (diff)
parentc2173e073ef7caa46f9870d35e040108a44e9e31 (diff)
downloadwekan-aa1646ad45de5877f193c6dd1734901827ef77d7.tar.gz
wekan-aa1646ad45de5877f193c6dd1734901827ef77d7.tar.bz2
wekan-aa1646ad45de5877f193c6dd1734901827ef77d7.zip
Merge branch 'ocdtrekkie-patch-1' into devel
Permit editing WIP limit. Thanks to nztqa and ocdtrekkie ! Closes #1310
-rw-r--r--CHANGELOG.md8
-rw-r--r--client/components/lists/listHeader.jade4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0521086..6dc1d242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+* [Permit editing WIP limit](https://github.com/wekan/wekan/pull/1312).
+
+Thanks to GitHub users nztqa and ocdtrekkie for their contributions.
+
# v0.51 2017-10-25 Wekan release
This release adds the following new features:
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 2927fe59..e1d2f9f4 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -76,14 +76,14 @@ template(name="listDeletePopup")
template(name="setWipLimitPopup")
#js-wip-limit-edit
- lable {{_ 'set-wip-limit-value'}}
+ label {{_ 'set-wip-limit-value'}}
ul.pop-over-list
li: a.js-enable-wip-limit {{_ 'enable-wip-limit'}}
if isWipLimitEnabled
i.fa.fa-check
if isWipLimitEnabled
p
- input.wip-limit-value(type="number" value="{{ wipLimitValue }}" min="1" max="99" onkeydown="return false")
+ input.wip-limit-value(type="number" value="{{ wipLimitValue }}" min="1" max="99")
input.wip-limit-apply(type="submit" value="{{_ 'apply'}}")
input.wip-limit-error