mirror of
https://github.com/wekan/wekan.git
synced 2025-04-23 05:27:14 -04:00
Merge branch 'wekan:master' into master
This commit is contained in:
Kai Lehmann
GitHub
commit
10d7eeb762
28 changed files with 1558 additions and 6908 deletions
|
|
@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
|
|||
|
||||
ENV \
|
||||
DEBUG=false \
|
||||
NODE_VERSION=v12.22.4 \
|
||||
NODE_VERSION=v12.22.5 \
|
||||
METEOR_RELEASE=1.10.2 \
|
||||
USE_EDGE=false \
|
||||
METEOR_EDGE=1.5-beta.17 \
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ parts:
|
|||
wekan:
|
||||
source: .
|
||||
plugin: nodejs
|
||||
node-engine: 12.22.4
|
||||
node-engine: 12.22.5
|
||||
node-packages:
|
||||
- node-gyp
|
||||
- node-pre-gyp
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ parts:
|
|||
wekan:
|
||||
source: .
|
||||
plugin: nodejs
|
||||
node-engine: 12.22.4
|
||||
node-engine: 12.22.5
|
||||
node-packages:
|
||||
- node-gyp
|
||||
- node-pre-gyp
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ sudo: required
|
|||
|
||||
env:
|
||||
TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
|
||||
TRAVIS_NODE_VERSION: 12.22.4
|
||||
TRAVIS_NODE_VERSION: 12.22.5
|
||||
TRAVIS_NPM_VERSION: latest
|
||||
|
||||
before_install:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ host = https://www.transifex.com
|
|||
# tap:i18n requires us to use `-` separator in the language identifiers whereas
|
||||
# Transifex uses a `_` separator, without an option to customize it on one side
|
||||
# or the other, so we need to do a Manual mapping.
|
||||
lang_map = ar_EG:ar-EG, bg_BG:bg, de_CH:de-CH, en_IT:en-IT, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el, fa_IR:fa-IR, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
|
||||
lang_map = ar_EG:ar-EG, bg_BG:bg, de_CH:de-CH, en_IT:en-IT, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el, fa_IR:fa-IR, fi_FI:fi, fr_CH:fr-CH, hu_HU:hu, id_ID:id, mn_MN:mn, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
|
||||
|
||||
[wekan.application]
|
||||
file_filter = i18n/<lang>.i18n.json
|
||||
|
|
|
|||
25
CHANGELOG.md
25
CHANGELOG.md
|
|
@ -3,13 +3,34 @@
|
|||
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.48 2021-08-11 Wekan release
|
||||
|
||||
This release adds the following new features:
|
||||
This release adds the following CRITICAL SECURITY UPDATES:
|
||||
|
||||
- [Updated to Node.js v12.22.5](https://github.com/wekan/wekan/commit/91cad7b49e25cecdf417321dadcdd9ea5cd8b020).
|
||||
Thanks to Node.js developers.
|
||||
- Also jszip update in some of included update commits.
|
||||
|
||||
and adds the following new features:
|
||||
|
||||
- [Searchfields for members and assignees card popups](https://github.com/wekan/wekan/pull/3942).
|
||||
Thanks to syndimann.
|
||||
|
||||
and adds the following updates:
|
||||
|
||||
- [Updated dependencies](https://github.com/wekan/wekan/commit/b3cc01b04167bd67dde02c6c899baf8917ae09c1).
|
||||
Thanks to developers of dependencies.
|
||||
|
||||
and adds the following new translations:
|
||||
|
||||
- [French (Switzerland) (fr_CH)](https://github.com/wekan/wekan/commit/23c70ac252494b464cd2a268d7e680370775ddc4).
|
||||
Thanks to translators.
|
||||
|
||||
and fixes the following bugs:
|
||||
|
||||
- [Fixed: Can't save user without Initials](https://github.com/wekan/wekan/commit/9a03654062f9c8ac7aac257f11b386a054cd39e7).
|
||||
Thanks to devagleo and xet7.
|
||||
|
||||
Thanks to above GitHub users for their contributions and translators for their translations.
|
||||
|
||||
# v5.47 2021-08-05 Wekan release
|
||||
|
|
|
|||
|
|
@ -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.4 \
|
||||
NODE_VERSION=v12.22.5 \
|
||||
METEOR_RELEASE=1.10.2 \
|
||||
USE_EDGE=false \
|
||||
METEOR_EDGE=1.5-beta.17 \
|
||||
|
|
|
|||
|
|
@ -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.4 \
|
||||
NODE_VERSION=v12.22.5 \
|
||||
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.4 \
|
||||
NODE_VERSION=v12.22.5 \
|
||||
NODE_ENV=production \
|
||||
NPM_VERSION=latest \
|
||||
WITH_API=true \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
|
||||
appVersion: "v5.47.0"
|
||||
appVersion: "v5.48.0"
|
||||
files:
|
||||
userUploads:
|
||||
- README.md
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ Template.userFormsLayout.helpers({
|
|||
name = 'Français (Belgique)';
|
||||
} else if (lang.name === 'fr-CA') {
|
||||
name = 'Français (Canada)';
|
||||
} else if (lang.name === 'fr-CH') {
|
||||
name = 'Français (Schweiz)';
|
||||
} else if (lang.name === 'ig') {
|
||||
name = 'Igbo';
|
||||
} else if (lang.name === 'lv') {
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ template(name="editUserPopup")
|
|||
input.js-profile-fullname(type="text" value=user.profile.fullname required)
|
||||
label
|
||||
| {{_ 'initials'}}
|
||||
input.js-profile-initials(type="text" value=user.profile.initials required)
|
||||
input.js-profile-initials(type="text" value=user.profile.initials)
|
||||
label
|
||||
| {{_ 'admin'}}
|
||||
select.select-role.js-profile-isadmin
|
||||
|
|
|
|||
|
|
@ -180,6 +180,8 @@ Template.changeLanguagePopup.helpers({
|
|||
name = 'Français (Belgique)';
|
||||
} else if (lang.name === 'fr-CA') {
|
||||
name = 'Français (Canada)';
|
||||
} else if (lang.name === 'fr-CH') {
|
||||
name = 'Français (Schweiz)';
|
||||
} else if (lang.name === 'ig') {
|
||||
name = 'Igbo';
|
||||
} else if (lang.name === 'lv') {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
apiVersion: v2
|
||||
appVersion: "5.47"
|
||||
appVersion: "5.48"
|
||||
dependencies:
|
||||
- condition: mongodb.enabled
|
||||
name: mongodb
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ serviceAccounts:
|
|||
##
|
||||
image:
|
||||
repository: quay.io/wekan/wekan
|
||||
tag: v5.47
|
||||
tag: v5.48
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
## Configuration for wekan component
|
||||
|
|
|
|||
|
|
@ -952,7 +952,7 @@
|
|||
"operator-created": "erstellt",
|
||||
"operator-modified": "geändert",
|
||||
"operator-sort": "sortieren",
|
||||
"operator-comment": "Kommentar",
|
||||
"operator-comment": "Kommentar speichern",
|
||||
"operator-has": "hat",
|
||||
"operator-limit": "Begrenzung",
|
||||
"predicate-archived": "archiviert",
|
||||
|
|
|
|||
1063
i18n/fr-CH.i18n.json
Normal file
1063
i18n/fr-CH.i18n.json
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -89,7 +89,7 @@
|
|||
"add-subtask": "Добавить подзадачу",
|
||||
"add-checklist": "Добавить контрольный список",
|
||||
"add-checklist-item": "Добавить пункт в контрольный список",
|
||||
"convertChecklistItemToCardPopup-title": "Convert to Card",
|
||||
"convertChecklistItemToCardPopup-title": "Преобразовать в Карточку",
|
||||
"add-cover": "Прикрепить",
|
||||
"add-label": "Добавить метку",
|
||||
"add-list": "Добавить простой список",
|
||||
|
|
@ -121,8 +121,8 @@
|
|||
"archives": "Архив",
|
||||
"template": "Шаблон",
|
||||
"templates": "Шаблоны",
|
||||
"template-container": "Template Container",
|
||||
"add-template-container": "Add Template Container",
|
||||
"template-container": "Шаблон Контейнера",
|
||||
"add-template-container": "Добавить Шаблон Контейнера",
|
||||
"assign-member": "Назначить участника",
|
||||
"attached": "прикреплено",
|
||||
"attachment": "Вложение",
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
"add-subtask": "新增子任務",
|
||||
"add-checklist": "新增待辦清單",
|
||||
"add-checklist-item": "新增項目",
|
||||
"convertChecklistItemToCardPopup-title": "Convert to Card",
|
||||
"convertChecklistItemToCardPopup-title": "轉換為卡片",
|
||||
"add-cover": "新增封面",
|
||||
"add-label": "新增標籤",
|
||||
"add-list": "新增清單",
|
||||
|
|
|
|||
7285
package-lock.json
generated
7285
package-lock.json
generated
File diff suppressed because it is too large
Load diff
24
package.json
24
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "wekan",
|
||||
"version": "v5.47.0",
|
||||
"version": "v5.48.0",
|
||||
"description": "Open-Source kanban",
|
||||
"private": true,
|
||||
"repository": {
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
"devDependencies": {
|
||||
"babel-plugin-istanbul": "^6.0.0",
|
||||
"chai": "^4.3.4",
|
||||
"flatted": "^3.2.0",
|
||||
"puppeteer": "^10.0.0",
|
||||
"sinon": "^11.1.1"
|
||||
"flatted": "^3.2.2",
|
||||
"puppeteer": "^10.2.0",
|
||||
"sinon": "^11.1.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.14.6",
|
||||
"@babel/runtime": "^7.14.6",
|
||||
"@babel/core": "^7.15.0",
|
||||
"@babel/runtime": "^7.15.3",
|
||||
"@liradb2000/markdown-it-mermaid": "^0.4.3",
|
||||
"ajv": "^6.12.6",
|
||||
"babel-runtime": "^6.26.0",
|
||||
|
|
@ -34,13 +34,13 @@
|
|||
"exceljs": "^4.2.1",
|
||||
"fibers": "^5.0.0",
|
||||
"gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
|
||||
"jszip": "^3.7.0",
|
||||
"ldapjs": "^2.3.0",
|
||||
"markdown-it": "^12.1.0",
|
||||
"jszip": "^3.7.1",
|
||||
"ldapjs": "^2.3.1",
|
||||
"markdown-it": "^12.2.0",
|
||||
"markdown-it-emoji": "^2.0.0",
|
||||
"meteor-node-stubs": "^1.0.3",
|
||||
"mongodb": "^3.6.9",
|
||||
"os": "^0.1.1",
|
||||
"meteor-node-stubs": "^1.1.0",
|
||||
"mongodb": "^3.6.11",
|
||||
"os": "^0.1.2",
|
||||
"page": "^1.11.5",
|
||||
"papaparse": "^5.3.1",
|
||||
"qs": "^6.10.1",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<meta charset="utf-8">
|
||||
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||
<title>Wekan REST API v5.47</title>
|
||||
<title>Wekan REST API v5.48</title>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
|
|
@ -1555,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
|
|||
<ul class="toc-list-h1">
|
||||
|
||||
<li>
|
||||
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.47">Wekan REST API v5.47</a>
|
||||
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.48">Wekan REST API v5.48</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
@ -2128,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
|
|||
<div class="page-wrapper">
|
||||
<div class="dark-box"></div>
|
||||
<div class="content">
|
||||
<h1 id="wekan-rest-api">Wekan REST API v5.47</h1>
|
||||
<h1 id="wekan-rest-api">Wekan REST API v5.48</h1>
|
||||
<blockquote>
|
||||
<p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
|
||||
</blockquote>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
swagger: '2.0'
|
||||
info:
|
||||
title: Wekan REST API
|
||||
version: v5.47
|
||||
version: v5.48
|
||||
description: |
|
||||
The REST API allows you to control and extend Wekan with ease.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.4/node-v12.22.4-x64.msi
|
||||
call node-v12.22.4-x64.msi
|
||||
curl -O https://nodejs.org/dist/v12.22.5/node-v12.22.5-x64.msi
|
||||
call node-v12.22.5-x64.msi
|
||||
|
||||
call npm config -g set msvs_version 2015
|
||||
call meteor npm config -g set msvs_version 2015
|
||||
|
|
|
|||
|
|
@ -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.4
|
||||
sudo n 12.22.5
|
||||
#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
|
||||
#sudo apt-get install -y nodejs
|
||||
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
|
|
@ -81,13 +81,13 @@ do
|
|||
cd ~/repos/wekan
|
||||
rm -rf node_modules .meteor/local .build
|
||||
chmod u+w *.json
|
||||
npm install
|
||||
meteor npm install
|
||||
meteor build .build --directory
|
||||
rm -rf ~/repos/wekan/.build/bundle/programs/web.browser.legacy
|
||||
cd ~/repos/wekan/.build/bundle/programs/server
|
||||
rm -rf node_modules
|
||||
chmod u+w *.json
|
||||
npm install
|
||||
meteor npm install
|
||||
# Cleanup
|
||||
cd ~/repos/wekan/.build/bundle
|
||||
find . -type d -name '*-garbage*' | xargs rm -rf
|
||||
|
|
|
|||
|
|
@ -57,6 +57,9 @@ tx pull -f -l fi
|
|||
echo "French:"
|
||||
tx pull -f -l fr
|
||||
|
||||
echo "French (Switzerland):"
|
||||
tx pull -f -l fr_CH
|
||||
|
||||
echo "Galician:"
|
||||
tx pull -f -l gl
|
||||
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
|
|||
appTitle = (defaultText = "Wekan"),
|
||||
# The name of the app as it is displayed to the user.
|
||||
|
||||
appVersion = 547,
|
||||
appVersion = 548,
|
||||
# Increment this for every release.
|
||||
|
||||
appMarketingVersion = (defaultText = "5.47.0~2021-08-05"),
|
||||
appMarketingVersion = (defaultText = "5.48.0~2021-08-11"),
|
||||
# Human-readable presentation of the app version.
|
||||
|
||||
minUpgradableAppVersion = 0,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
name: wekan
|
||||
version: '5.47'
|
||||
version: '5.48'
|
||||
summary: The open-source kanban
|
||||
description: |
|
||||
Wekan is an open-source and collaborative kanban board application.
|
||||
|
|
@ -80,7 +80,7 @@ parts:
|
|||
wekan:
|
||||
source: .
|
||||
plugin: nodejs
|
||||
node-engine: 12.22.4
|
||||
node-engine: 12.22.5
|
||||
node-packages:
|
||||
- node-gyp
|
||||
- node-pre-gyp
|
||||
|
|
|
|||
|
|
@ -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.4
|
||||
NODE_VERSION=v12.22.5
|
||||
#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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue