From b2e96746dbd40bbc99bd48568f1f42b1905b986e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 16 Jul 2021 16:22:08 +0300 Subject: [PATCH 1/5] Updated translations. --- i18n/zh-TW.i18n.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 30398efdf..77c26eeda 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -120,8 +120,8 @@ "archives": "封存", "template": "範本", "templates": "範本", - "template-container": "Template Container", - "add-template-container": "Add Template Container", + "template-container": "範本容器", + "add-template-container": "新增範本容器", "assign-member": "分配成員", "attached": "附加", "attachment": "附件", @@ -199,12 +199,12 @@ "poker-oneHundred": "100", "poker-unsure": "?", "poker-finish": "完成", - "poker-result-votes": "Votes", - "poker-result-who": "Who", + "poker-result-votes": "投票", + "poker-result-who": "誰", "poker-replay": "重播", - "set-estimation": "Set Estimation", + "set-estimation": "設定預估時間", "deletePokerPopup-title": "刪除規劃撲克?", - "poker-delete-pop": "Deleting is permanent. You will lose all actions associated with this planning poker.", + "poker-delete-pop": "刪除是永遠的，你會失去所有與此規劃撲克相關動作關聯", "cardDeletePopup-title": "徹底刪除卡片？", "cardDetailsActionsPopup-title": "卡片操作", "cardLabelsPopup-title": "標籤", @@ -1041,7 +1041,7 @@ "creator": "創建者", "filesReportTitle": "Files Report", "orphanedFilesReportTitle": "Orphaned Files Report", - "reports": "Reports", + "reports": "報告", "rulesReportTitle": "Rules Report", "copy-swimlane": "複製泳道流程圖", "copySwimlanePopup-title": "複製泳道流程圖", From 8770326ed30650cc3c3b435a6147774837ec9a5c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 18 Jul 2021 15:32:00 +0300 Subject: [PATCH 2/5] Updated translations. --- i18n/cs.i18n.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 67f23011f..f3f8b1e4d 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -81,7 +81,7 @@ "activity-endDate": "editoval(a) datum ukončení na %s z %s", "add-attachment": "Přidat přílohu", "add-board": "Přidat tablo", - "add-template": "Add Template", + "add-template": "Přidat šablonu", "add-card": "Přidat kartu", "add-card-to-top-of-list": "Přidat kartu na začátek seznamu", "add-card-to-bottom-of-list": "Přidat kartu na konec seznamu", @@ -120,8 +120,8 @@ "archives": "Archiv", "template": "Šablona", "templates": "Šablony", - "template-container": "Template Container", - "add-template-container": "Add Template Container", + "template-container": "Kontejner šablony", + "add-template-container": "Přidat kontejner šablony", "assign-member": "Přiřadit člena", "attached": "přiloženo", "attachment": "Příloha", From d538a01d1962464cf4cb001462669150eeafaa99 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 18 Jul 2021 15:37:50 +0300 Subject: [PATCH 3/5] Updated to Node.js v12.22.3. Thanks to Node.js developers. --- .devcontainer/Dockerfile | 2 +- .future-snap/broken-snapcraft.yaml | 2 +- .future-snap/snapcraft.yaml | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.arm64v8 | 4 ++-- rebuild-wekan.bat | 4 ++-- rebuild-wekan.sh | 2 +- snapcraft.yaml | 2 +- stacksmith/user-scripts/build.sh | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ad36196d0..a7fe2772e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV \ DEBUG=false \ - NODE_VERSION=v12.22.2 \ + NODE_VERSION=v12.22.3 \ METEOR_RELEASE=1.10.2 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/.future-snap/broken-snapcraft.yaml b/.future-snap/broken-snapcraft.yaml index 1cabda5df..55f453a93 100644 --- a/.future-snap/broken-snapcraft.yaml +++ b/.future-snap/broken-snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.22.2 + node-engine: 12.22.3 node-packages: - node-gyp - node-pre-gyp diff --git a/.future-snap/snapcraft.yaml b/.future-snap/snapcraft.yaml index 4bdbc3a0a..75ae5a153 100644 --- a/.future-snap/snapcraft.yaml +++ b/.future-snap/snapcraft.yaml @@ -83,7 +83,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.22.2 + node-engine: 12.22.3 node-packages: - node-gyp - node-pre-gyp diff --git a/.travis.yml b/.travis.yml index 212b45919..188993ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required env: TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0 - TRAVIS_NODE_VERSION: 12.22.2 + TRAVIS_NODE_VERSION: 12.22.3 TRAVIS_NPM_VERSION: latest before_install: diff --git a/Dockerfile b/Dockerfile index 6c11a826b..4cc43624d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ DEBUG=false \ - NODE_VERSION=v12.22.2 \ + NODE_VERSION=v12.22.3 \ METEOR_RELEASE=1.10.2 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 2c23f1c74..c6cc8a920 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder ENV QEMU_VERSION=v4.2.0-6 \ QEMU_ARCHITECTURE=aarch64 \ NODE_ARCHITECTURE=linux-arm64 \ - NODE_VERSION=v12.22.2 \ + NODE_VERSION=v12.22.3 \ WEKAN_VERSION=latest \ WEKAN_ARCHITECTURE=arm64 @@ -40,7 +40,7 @@ LABEL maintainer="wekan" # Set the environment variables (defaults where required) ENV QEMU_ARCHITECTURE=aarch64 \ NODE_ARCHITECTURE=linux-arm64 \ - NODE_VERSION=v12.22.2 \ + NODE_VERSION=v12.22.3 \ NODE_ENV=production \ NPM_VERSION=latest \ WITH_API=true \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index d3b71891e..07ca2493a 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -18,8 +18,8 @@ REM Install chocolatey choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor -curl -O https://nodejs.org/dist/v12.22.2/node-v12.22.2-x64.msi -call node-v12.22.2-x64.msi +curl -O https://nodejs.org/dist/v12.22.3/node-v12.22.3-x64.msi +call node-v12.22.3-x64.msi call npm config -g set msvs_version 2015 call meteor npm config -g set msvs_version 2015 diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 864f679ec..58a8ea502 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -28,7 +28,7 @@ do #curl -0 -L https://npmjs.org/install.sh | sudo sh #sudo chown -R $(id -u):$(id -g) $HOME/.npm sudo npm -g install n - sudo n 12.22.2 + sudo n 12.22.3 #curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - #sudo apt-get install -y nodejs elif [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/snapcraft.yaml b/snapcraft.yaml index eccaf6aa6..50b4d3dc5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -80,7 +80,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.22.2 + node-engine: 12.22.3 node-packages: - node-gyp - node-pre-gyp diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index 50180f405..24426f77d 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,7 +2,7 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v12.22.2 +NODE_VERSION=v12.22.3 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false METEOR_EDGE=1.5-beta.17 From d939ab0d767619d46ac2a0711eb4b7bbe1872427 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 18 Jul 2021 15:39:51 +0300 Subject: [PATCH 4/5] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 260cbb614..7156254f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ and adds the following updates: [Part 1](https://github.com/wekan/wekan/commit/7024929881c05cad472de74c86517cf80c8e240c), [Part 2](https://github.com/wekan/wekan/commit/609adcdf100db226c5f310577195afa4b1a4aead). Thanks to developers of dependencies. +- [Updated to Node.js v12.22.3](https://github.com/wekan/wekan/commit/d538a01d1962464cf4cb001462669150eeafaa99). + Thanks to Node.js developers. and fixes the following bugs: From f7d6ac9401f6f12a88f611e7bca5ef679cef4288 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 18 Jul 2021 15:46:34 +0300 Subject: [PATCH 5/5] v5.38 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- public/api/wekan.html | 198 ++++++++++++++++++++++++++++++++++++----- public/api/wekan.yml | 54 ++++++++++- sandstorm-pkgdef.capnp | 4 +- snapcraft.yaml | 2 +- 8 files changed, 234 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7156254f4..c487cc890 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Note: With Docker, please don't use latest tag. Only use release tags. See https://github.com/wekan/wekan/issues/3874 -# Upcoming Wekan release +# v5.38 2021-07-18 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index fc2d66468..117fd45c6 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v5.37.0" +appVersion: "v5.38.0" files: userUploads: - README.md diff --git a/package-lock.json b/package-lock.json index 27f2342a6..90ae68ba0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.37.0", + "version": "v5.38.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 5b4b6d303..c955e5560 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.37.0", + "version": "v5.38.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index fb327b525..b3289fd3b 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v5.37 + Wekan REST API v5.38 @@ -1490,6 +1490,8 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc + + @@ -1553,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - Wekan REST API v5.37 + Wekan REST API v5.38
    • @@ -1996,6 +1998,16 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc +
  • + BoardsOrgs + +
    • + +
  • + BoardsTeams + +
    • +
  • CardComments @@ -2116,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v5.37

    +

    Wekan REST API v5.38

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

    @@ -3516,6 +3528,20 @@ System.out.println(response.toString()); } ], "permission": "public", + "orgs": [ + { + "orgId": "string", + "orgDisplayName": "string", + "isActive": true + } + ], + "teams": [ + { + "teamId": "string", + "teamDisplayName": "string", + "isActive": true + } + ], "color": "belize", "description": "string", "subtasksDefaultBoardId": "string", @@ -18294,6 +18320,20 @@ UserSecurity } ], "permission": "public", + "orgs": [ + { + "orgId": "string", + "orgDisplayName": "string", + "isActive": true + } + ], + "teams": [ + { + "teamId": "string", + "teamDisplayName": "string", + "isActive": true + } + ], "color": "belize", "description": "string", "subtasksDefaultBoardId": "string", @@ -18413,6 +18453,20 @@ UserSecurity visibility of the board +orgs +[BoardsOrgs]¦null +false +none +the list of organizations that a board belongs to + + +teams +[BoardsTeams]¦null +false +none +the list of teams that a board belongs to + + color string true @@ -18982,6 +19036,100 @@ UserSecurity +

    BoardsOrgs

    +

    + + +

    +
    {
+  "orgId": "string",
+  "orgDisplayName": "string",
+  "isActive": true
+}
+
+
    +

    Properties

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameTypeRequiredRestrictionsDescription
    orgIdstringtruenoneThe uniq ID of the organization
    orgDisplayNamestringtruenoneThe display name of the organization
    isActivebooleantruenoneIs the organization active?
    +

    BoardsTeams

    +

    + + +

    +
    {
+  "teamId": "string",
+  "teamDisplayName": "string",
+  "isActive": true
+}
+
+
    +

    Properties

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameTypeRequiredRestrictionsDescription
    teamIdstringtruenoneThe uniq ID of the team
    teamDisplayNamestringtruenoneThe display name of the team
    isActivebooleantruenoneIs the team active?

    CardComments

    @@ -18998,7 +19146,7 @@ UserSecurity

    A comment on a card

    -

    Properties

    +

    Properties

    @@ -19158,7 +19306,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -19547,7 +19695,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -19646,7 +19794,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -19766,7 +19914,7 @@ UserSecurity 
    {}
    -

    Properties

    +

    Properties

    None

    ChecklistItems

    @@ -19785,7 +19933,7 @@ UserSecurity

    An item in a checklist

    -

    Properties

    +

    Properties

    @@ -19864,7 +20012,7 @@ UserSecurity

    A Checklist

    -

    Properties

    +

    Properties

    @@ -19949,7 +20097,7 @@ UserSecurity

    A custom field on a card in the board

    -

    Properties

    +

    Properties

    @@ -20087,7 +20235,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -20137,7 +20285,7 @@ UserSecurity 
    {}
    -

    Properties

    +

    Properties

    None

    Integrations

    @@ -20161,7 +20309,7 @@ UserSecurity

    Integration with third-party applications

    -

    Properties

    +

    Properties

    @@ -20272,7 +20420,7 @@ UserSecurity

    A list (column) in the Wekan board.

    -

    Properties

    +

    Properties

    @@ -20500,7 +20648,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -20555,7 +20703,7 @@ UserSecurity

    A swimlane is an line in the kaban board.

    -

    Properties

    +

    Properties

    @@ -20828,7 +20976,7 @@ UserSecurity

    A User in wekan

    -

    Properties

    +

    Properties

    @@ -20989,7 +21137,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21214,7 +21362,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21246,7 +21394,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21285,7 +21433,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21324,7 +21472,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21363,7 +21511,7 @@ UserSecurity } -

    Properties

    +

    Properties

    @@ -21416,6 +21564,8 @@ UserSecurity + +
    diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 0b8d9d01c..841885259 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.37 + version: v5.38 description: | The REST API allows you to control and extend Wekan with ease. @@ -2690,6 +2690,20 @@ definitions: enum: - public - private + orgs: + description: | + the list of organizations that a board belongs to + type: array + items: + $ref: "#/definitions/BoardsOrgs" + x-nullable: true + teams: + description: | + the list of teams that a board belongs to + type: array + items: + $ref: "#/definitions/BoardsTeams" + x-nullable: true color: description: | The color of the board. @@ -2969,6 +2983,44 @@ definitions: - userId - isAdmin - isActive + BoardsOrgs: + type: object + properties: + orgId: + description: | + The uniq ID of the organization + type: string + orgDisplayName: + description: | + The display name of the organization + type: string + isActive: + description: | + Is the organization active? + type: boolean + required: + - orgId + - orgDisplayName + - isActive + BoardsTeams: + type: object + properties: + teamId: + description: | + The uniq ID of the team + type: string + teamDisplayName: + description: | + The display name of the team + type: string + isActive: + description: | + Is the team active? + type: boolean + required: + - teamId + - teamDisplayName + - isActive CardComments: type: object description: A comment on a card diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index f64722be1..21a369b46 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 = 537, + appVersion = 538, # Increment this for every release. - appMarketingVersion = (defaultText = "5.37.0~2021-07-04"), + appMarketingVersion = (defaultText = "5.38.0~2021-07-18"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 50b4d3dc5..5d2c2562c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '5.37' +version: '5.38' summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application.