From c3d495e7c6dead054e897bc51703220b720dbb86 Mon Sep 17 00:00:00 2001 From: Christoph Jahn Date: Mon, 17 Jun 2019 21:05:21 +0200 Subject: [PATCH 1/3] Show buttons for isBoardAdmin --- client/components/rules/rulesList.jade | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/client/components/rules/rulesList.jade b/client/components/rules/rulesList.jade index c2676aa7d..b8d49a667 100644 --- a/client/components/rules/rulesList.jade +++ b/client/components/rules/rulesList.jade @@ -17,6 +17,10 @@ template(name="rulesList") button.js-delete-rule i.fa.fa-trash-o | {{{_ 'r-delete-rule'}}} + else if currentUser.isBoardAdmin + button.js-delete-rule + i.fa.fa-trash-o + | {{{_ 'r-delete-rule'}}} else li.no-items-message {{{_ 'r-no-rules' }}} if currentUser.isAdmin @@ -24,4 +28,10 @@ template(name="rulesList") button.js-goto-trigger i.fa.fa-plus | {{{_ 'r-add-rule'}}} - input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle") \ No newline at end of file + input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle") + else if currentUser.isBoardAdmin + div.rules-add + button.js-goto-trigger + i.fa.fa-plus + | {{{_ 'r-add-rule'}}} + input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle") From b39b9f5463d3b95958681e575fb33424084fbd8b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 18 Jun 2019 21:28:32 +0300 Subject: [PATCH 2/3] Update changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 872d37190..ec1a77811 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Buttons for adding rules to a board where missing for isBoardAdmin](https://github.com/wekan/wekan/pull/2500). + Thanks to road42. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.83 2019-06-17 Wekan release This release fixes the following bugs: From b48c6a5b9cc18f78017a6b5eca74ce670ed3b484 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 18 Jun 2019 23:43:49 +0300 Subject: [PATCH 3/3] v2.84 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec1a77811..0850928a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.84 2019-06-18 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 4d43fa4f2..8b916ad4b 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.83.0" +appVersion: "v2.84.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 28748ecf0..63c9bfddd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.83.0", + "version": "v2.84.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index f3f51d1d4..e5d60fb54 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 = 285, + appVersion = 286, # Increment this for every release. - appMarketingVersion = (defaultText = "2.83.0~2019-06-17"), + appMarketingVersion = (defaultText = "2.84.0~2019-06-18"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,