diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1b1b0d5e6..cd8f1f6c5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,10 @@ -FROM ubuntu:rolling +FROM ubuntu:21.10 LABEL maintainer="sgr" +# 2022-04-25: +# - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, +# so changing to 21.10. https://github.com/wekan/wekan/issues/4488 + ENV BUILD_DEPS="gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2" ENV DEBIAN_FRONTEND=noninteractive diff --git a/CHANGELOG.md b/CHANGELOG.md index 9614e47c6..6e7b8dd0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,28 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# Upcoming WeKan ® release +# v6.21 2022-04-28 WeKan ® release + +This release fixes the following bugs: + +- [Fix themes](https://github.com/wekan/wekan/pull/4490). + Thanks to TheExo. +- [Try to fix Snap by adding cypress and jest for cypress-image-snapshot and jest-image-snapshot](https://github.com/wekan/wekan/commit/7dd5fa4ac40f0fe63168b9a2ef4a0940bfc9d80b). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + +# v6.20 2022-04-25 WeKan ® release + +This release fixes the following bugs: + +- [Fix Dockerfile: Ubuntu 22.04 causes Python trouble](https://github.com/wekan/wekan/commit/79a866e2384d262572edf68503f31e699df675eb). + Thanks to bronger. +- [FileStoreStrategyFactory, added logic to determine the right file storage strategy to use](https://github.com/wekan/wekan/pull/4486). + Thanks to mfilser. + +Thanks to above GitHub users for their contributions and translators for their translations. + +# v6.19 2022-04-22 WeKan ® release This release adds the following new features: @@ -10,10 +32,14 @@ This release adds the following new features: Thanks to mfilser and xet7. - [Added All Boards Settings popup title](https://github.com/wekan/wekan/commit/023deb6c953b66f4dfcbff68ab2d1871dfb45d51). Thanks to xet7. +- [Updated All Boards Settings icon](https://github.com/wekan/wekan/commit/ce55d84fd83f58d25797cfccf5cec35b68b41732). + Thanks to xet7. - [Added to Board Settings: Minicard Settings and All Boards Settings improvements](https://github.com/wekan/wekan/commit/95a4b4fd919683e51e56a7bb76213b146a170e09). Thanks to xet7. - [Added Table View to My Cards](https://github.com/wekan/wekan/pulls/4479). Thanks to helioguardabaxo. +- [Fix syntax in myCards.jade](https://github.com/wekan/wekan/commit/d271678ef494675d78ada25ee33f1d18d3d7ce14). + Thanks to xet7. - [Multi file storage for moving between MongoDB GridFS and filesystem](https://github.com/wekan/wekan/pull/4484). Thanks to mfilser. @@ -31,6 +57,8 @@ and fixes the following bugs: - [Fix Board Settings / All Boards Settings options has some bug](https://github.com/wekan/wekan/commit/77085daaa8b16f05acb314f077f48bf1d4ddbbac). Thanks to helioguardabaxo. +- [.gitignore, ignore all vim swap files](https://github.com/wekan/wekan/commit/5e567365f3b4e7cc40558105a0bd779efa17ac5b). + Thanks to mfilser. Thanks to above GitHub users for their contributions and translators for their translations. diff --git a/Dockerfile b/Dockerfile index e68023da7..7506deab6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ -FROM ubuntu:rolling +FROM ubuntu:21.10 LABEL maintainer="wekan" +# 2022-04-25: +# - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, +# so changing to 21.10. https://github.com/wekan/wekan/issues/4488 + # 2021-09-18: # - Above Ubuntu base image copied from Docker Hub ubuntu:hirsute-20210825 # to Quay to avoid Docker Hub rate limits. diff --git a/Stackerfile.yml b/Stackerfile.yml index 80a6a9b1e..f30dc3f56 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v6.18.0" +appVersion: "v6.21.0" files: userUploads: - README.md diff --git a/client/components/boards/boardColors.styl b/client/components/boards/boardColors.styl index b89dedc32..f1d4710b6 100644 --- a/client/components/boards/boardColors.styl +++ b/client/components/boards/boardColors.styl @@ -1068,9 +1068,19 @@ setBoardClear(color1,color2) border-left: 1px solid #333333 color: #cccccc - .activities .activity .activity-desc .activity-comment - background-color: #cccccc - color: #222222 + .activities .activity .activity-desc + .activity-comment + background-color: #cccccc + color: #222222 + .activity-checklist + background-color: #cccccc + color: #222222; + + .attachments-galery .attachment-item + color: #222222; + + .minicard-description + color: #222222; /* Pop-Ups for "Modern Dark" */ .pop-over.board-color-moderndark @@ -1149,13 +1159,18 @@ setBoardClear(color1,color2) textarea color: white; + .minicard .minicard-description + background: #2b2b2b; + border: 1px solid #00897b; + + .minicard:hover:not(.minicard-composer) border: 1px solid #00897b; background: #2b2b2b; padding: 9px 9px 3px 9px;/*because of the 1px border we need to reduce padding by 1px*/ .card-details - background: #2b2b2b; + background: #2b2b2b!important; color: white; .card-details .card-details-header @@ -1169,9 +1184,42 @@ setBoardClear(color1,color2) .card-details, .sidebar-content box-shadow: 0 0 7px 0 #00897b; + .attachments-galery .attachment-item + background: #2b2b2b + + .attachments-galery .attachment-item:hover + border: 1px solid #00897b; + background: #2b2b2b; + + .checklist + background: #2b2b2b; + .checklist-item + background: #2b2b2b; + &:hover + background: #2b2b2b; + + .add-checklist-item.js-open-inlined-form:hover + background: #2b2b2b; + border: 1px solid #00897b; + + .add-checklist.js-open-inlined-form:hover + background: #2b2b2b; + border: 1px solid #00897b; + .card-details > h1,h2,h3,h4,h5,h6,p,a,span color: white!important; + .activity-desc + background-color: #2b2b2b!important; + + .activity-checklist + background: #2b2b2b!important; + border: 1px solid #00897b; + + .activity-comment + background: #2b2b2b!important; + border: 1px solid #00897b; + .toggle-switch:checked ~ .toggle-label background-color: #00897b!important; diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 9836fd932..92bea3e15 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "6.18" +appVersion: "6.21" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 4ab573615..6dccb838e 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v6.18 + tag: v6.21 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/imports/i18n/data/es.i18n.json b/imports/i18n/data/es.i18n.json index c958e24c4..5687dbda5 100644 --- a/imports/i18n/data/es.i18n.json +++ b/imports/i18n/data/es.i18n.json @@ -217,7 +217,7 @@ "deletePokerPopup-title": "Delete planning poker?", "poker-delete-pop": "Deleting is permanent. You will lose all actions associated with this planning poker.", "cardDeletePopup-title": "¿Eliminar la tarjeta?", - "cardArchivePopup-title": "Archive Card?", + "cardArchivePopup-title": "¿Archivar tarjeta?", "cardDetailsActionsPopup-title": "Acciones de la tarjeta", "cardLabelsPopup-title": "Etiquetas", "cardMembersPopup-title": "Miembros", @@ -279,8 +279,8 @@ "comment-placeholder": "Escribir comentario", "comment-only": "Sólo comentarios", "comment-only-desc": "Solo puedes comentar en las tarjetas.", - "comment-delete": "Are you sure you want to delete the comment?", - "deleteCommentPopup-title": "Delete comment?", + "comment-delete": "¿Seguro que quieres borrar el comentario?", + "deleteCommentPopup-title": "¿Borrar comentario?", "no-comments": "No hay comentarios", "no-comments-desc": "No se pueden mostrar comentarios ni actividades.", "worker": "Trabajador", @@ -288,7 +288,7 @@ "computer": "el ordenador", "confirm-subtask-delete-popup": "¿Seguro que quieres eliminar la subtarea?", "confirm-checklist-delete-popup": "Are you sure you want to delete the checklist?", - "subtaskDeletePopup-title": "Delete Subtask?", + "subtaskDeletePopup-title": "¿Borrar subtarea?", "checklistDeletePopup-title": "Delete Checklist?", "copy-card-link-to-clipboard": "Copiar el enlace de la tarjeta al portapapeles", "copy-text-to-clipboard": "Copy text to clipboard", diff --git a/models/lib/fileStoreStrategy.js b/models/lib/fileStoreStrategy.js index d8f0cc15b..15004d088 100644 --- a/models/lib/fileStoreStrategy.js +++ b/models/lib/fileStoreStrategy.js @@ -31,7 +31,7 @@ export default class FileStoreStrategyFactory { if (!storage) { storage = fileObj.versions[versionName].storage; if (!storage) { - if (fileObj.meta.source == "import") { + if (fileObj.meta.source == "import" || fileObj.versions[versionName].meta.gridFsFileId) { // uploaded by import, so it's in GridFS (MongoDB) storage = STORAGE_NAME_GRIDFS; } else { diff --git a/package-lock.json b/package-lock.json index b70833d89..fcea632b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.18.0", + "version": "v6.20.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9f243c1fe..2eafd058f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.18.0", + "version": "v6.20.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 032c2ac07..ddee17bba 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v6.18 + Wekan REST API v6.21 @@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc