From 555d31cca6139538acdc677587d8e0054e3e2afe Mon Sep 17 00:00:00 2001 From: rjevnikar Date: Tue, 28 Aug 2018 20:23:29 +0000 Subject: [PATCH 1/3] Only allow ifCanModify users to add dates (received, start, end, and due). --- client/components/cards/cardDetails.jade | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ad2044e8b..10828445a 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -36,28 +36,32 @@ template(name="cardDetails") if getReceived +cardReceivedDate else - a.js-received-date {{_ 'add'}} + if canModifyCard + a.js-received-date {{_ 'add'}} .card-details-item.card-details-item-start h3.card-details-item-title {{_ 'card-start'}} if getStart +cardStartDate else - a.js-start-date {{_ 'add'}} + if canModifyCard + a.js-start-date {{_ 'add'}} .card-details-item.card-details-item-due h3.card-details-item-title {{_ 'card-due'}} if getDue +cardDueDate else - a.js-due-date {{_ 'add'}} + if canModifyCard + a.js-due-date {{_ 'add'}} .card-details-item.card-details-item-end h3.card-details-item-title {{_ 'card-end'}} if getEnd +cardEndDate else - a.js-end-date {{_ 'add'}} + if canModifyCard + a.js-end-date {{_ 'add'}} .card-details-items .card-details-item.card-details-item-members From ec3902021edafd43c4aa6eb18830d369485918fe Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 29 Aug 2018 00:29:43 +0300 Subject: [PATCH 2/3] - Only allow ifCanModify users to add dates on cards. Thanks to rjevnikar ! --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae395e964..57233ac37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Only allow ifCanModify users to add dates on cards](https://github.com/wekan/wekan/pull/1867). + +Thanks to GitHub user rjevnikar for contributions. + # v1.38 2018-08-29 Wekan release This release adds the following new features: From 066237de081574b2a310b54cce211bdc680e1d40 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 29 Aug 2018 00:37:21 +0300 Subject: [PATCH 3/3] v1.39 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57233ac37..e1a8e64ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.39 2018-08-29 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 597dc521a..64bbf3e50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.38.0", + "version": "1.39.0", "description": "The open-source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index cab36a72f..f143377b1 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 = 123, + appVersion = 124, # Increment this for every release. - appMarketingVersion = (defaultText = "1.38.0~2018-08-29"), + appMarketingVersion = (defaultText = "1.39.0~2018-08-29"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,