From ee2fafb6bc5133f06a562fcab42767f99ccee791 Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sat, 18 Dec 2021 13:03:37 +0100 Subject: [PATCH 1/7] Fix: boardAdmin can't edit or delete others comments on cards #4237 --- models/cardComments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cardComments.js b/models/cardComments.js index 8dbd437e2..f8c860704 100644 --- a/models/cardComments.js +++ b/models/cardComments.js @@ -75,10 +75,10 @@ CardComments.allow({ return allowIsBoardMember(userId, Boards.findOne(doc.boardId)); }, update(userId, doc) { - return userId === doc.userId; + return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); }, remove(userId, doc) { - return userId === doc.userId; + return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); }, fetch: ['userId', 'boardId'], }); From 39fb0e4911d1b5d4dca6e97486238fce2832160f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 14:56:55 +0200 Subject: [PATCH 2/7] Updated ChangeLog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 940b195b1..b3ccbd52a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) +# Upcoming WeKan ® release + +This release fixes the following bugs: + +- [Fix: BoardAdmin can't edit or delete others comments on cards](https://github.com/wekan/wekan/pull/4248). + Thanks to Ben0it-T. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v5.85 2021-12-17 WeKan ® release This release adds the following updates: From 184290ce985c035d82272a77f2383bfc04eb6827 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 15:22:15 +0200 Subject: [PATCH 3/7] v5.86 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- helm/wekan/Chart.yaml | 2 +- helm/wekan/values.yaml | 2 +- package-lock.json | 2 +- package.json | 2 +- public/api/wekan.html | 6 +++--- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 4 ++-- snapcraft.yaml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3ccbd52a..7c865e38d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# Upcoming WeKan ® release +# v5.86 2021-12-19 WeKan ® release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 47bbea0c1..ee4b6a243 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v5.85.0" +appVersion: "v5.86.0" files: userUploads: - README.md diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 0350a7b89..05c42eb49 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "5.85" +appVersion: "5.86" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index dc0438144..f095ed072 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v5.85 + tag: v5.86 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/package-lock.json b/package-lock.json index 59d0a8812..f2bbc2c98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.85.0", + "version": "v5.86.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4ea9fc8bf..9d09e1471 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.85.0", + "version": "v5.86.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 063b18baf..ddd581ff4 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v5.85 + Wekan REST API v5.86 @@ -1555,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - Wekan REST API v5.85 + Wekan REST API v5.86
    • @@ -2128,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v5.85

    +

    Wekan REST API v5.86

    Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

    diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 403b2db4a..4dfa1a619 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v5.85 + version: v5.86 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 296231b50..c0ffca5d3 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 = 585, + appVersion = 586, # Increment this for every release. - appMarketingVersion = (defaultText = "5.85.0~2021-12-17"), + appMarketingVersion = (defaultText = "5.86.0~2021-12-19"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 47a77f4c1..9db401dd6 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '5.85' +version: '5.86' summary: Open Source kanban description: | WeKan ® is an Open Source and collaborative kanban board application. From 8446640060e6e5058d0d186d71831a32a9e606e3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 15:51:46 +0200 Subject: [PATCH 4/7] Changed Docker base image to ubuntu:rolling . Thanks to xet7 ! --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb4dc9d72..c82283d97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/wekan/ubuntu:impish-20211102 +FROM ubuntu:rolling LABEL maintainer="wekan" # 2021-09-18: From 45d7be19b6f427a08d294f5ee2cc523c348a2aa8 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 15:53:09 +0200 Subject: [PATCH 5/7] Updated ChangeLog. --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c865e38d..d913989b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) +# Upcoming WeKan release + +- [Changed Docker base image to ubuntu:rolling](https://github.com/wekan/wekan/commit/8446640060e6e5058d0d186d71831a32a9e606e3). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v5.86 2021-12-19 WeKan ® release This release fixes the following bugs: From 7f8f3f8f16b468b929a48130a726d65b88606089 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 15:58:10 +0200 Subject: [PATCH 6/7] v5.87 --- CHANGELOG.md | 4 +++- Stackerfile.yml | 2 +- helm/wekan/Chart.yaml | 2 +- helm/wekan/values.yaml | 2 +- package-lock.json | 2 +- package.json | 2 +- public/api/wekan.html | 6 +++--- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 4 ++-- snapcraft.yaml | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d913989b3..7980614d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# Upcoming WeKan release +# v5.87 2021-12-19 WeKan ® release + +This release adds the following updates: - [Changed Docker base image to ubuntu:rolling](https://github.com/wekan/wekan/commit/8446640060e6e5058d0d186d71831a32a9e606e3). Thanks to xet7. diff --git a/Stackerfile.yml b/Stackerfile.yml index ee4b6a243..2ba483b18 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v5.86.0" +appVersion: "v5.87.0" files: userUploads: - README.md diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 05c42eb49..68de41335 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "5.86" +appVersion: "5.87" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index f095ed072..50757f717 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v5.86 + tag: v5.87 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/package-lock.json b/package-lock.json index f2bbc2c98..cfd0c71ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.86.0", + "version": "v5.87.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d09e1471..f3542ecca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.86.0", + "version": "v5.87.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index ddd581ff4..7a2df1473 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v5.86 + Wekan REST API v5.87 @@ -1555,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    • - Wekan REST API v5.86 + Wekan REST API v5.87
      • @@ -2128,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
      -

      Wekan REST API v5.86

      +

      Wekan REST API v5.87

      Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

      diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 4dfa1a619..64b4565cc 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v5.86 + version: v5.87 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c0ffca5d3..42503d69a 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 = 586, + appVersion = 587, # Increment this for every release. - appMarketingVersion = (defaultText = "5.86.0~2021-12-19"), + appMarketingVersion = (defaultText = "5.87.0~2021-12-19"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 9db401dd6..afdc3220e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '5.86' +version: '5.87' summary: Open Source kanban description: | WeKan ® is an Open Source and collaborative kanban board application. From 4ded5d2f5167378ec918f20871cc011a14aa9210 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 19 Dec 2021 16:12:33 +0200 Subject: [PATCH 7/7] Fixed arm build server paths. Thanks to xet7 ! --- releases/release-bundle.sh | 4 ++-- releases/up-a.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/releases/release-bundle.sh b/releases/release-bundle.sh index 309c041a0..65518c2b1 100755 --- a/releases/release-bundle.sh +++ b/releases/release-bundle.sh @@ -6,11 +6,11 @@ cd ~/repos/wekan/.build zip -r wekan-$1.zip bundle { - scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/repos/maintainer-make-bundle.sh + scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/maintainer-make-bundle.sh scp ~/repos/wekan/releases/maintainer-make-bundle-s.sh s:/home/linux1/maintainer-make-bundle.sh scp ~/repos/wekan/releases/maintainer-make-bundle-o.sh o:/home/ubuntu/maintainer-make-bundle.sh scp wekan-$1.zip x2:/var/snap/wekan/common/releases.wekan.team/ - scp wekan-$1.zip a:/home/wekan/repos/ + scp wekan-$1.zip a:/home/wekan/ scp wekan-$1.zip s:/home/linux1/ scp wekan-$1.zip o:/home/ubuntu/ } | parallel -k diff --git a/releases/up-a.sh b/releases/up-a.sh index 7eebc9270..019ab34ca 100755 --- a/releases/up-a.sh +++ b/releases/up-a.sh @@ -11,7 +11,7 @@ if [ $# -ne 1 ] fi # 2) Download release from arm64 build server -scp a:/home/wekan/repos/wekan-$1-arm64.zip . +scp a:/home/wekan/wekan-$1-arm64.zip . # 3) Upload arm64 release to download server scp wekan-$1-arm64.zip x2:/var/snap/wekan/common/releases.wekan.team/raspi3/