From 7eb04897abb2c06dd9efa62e2cfae68700f7cc6d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 15:01:06 +0300 Subject: [PATCH 01/13] Updated translations. --- i18n/de.i18n.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index ffae36f7a..6b73aa7d6 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -282,7 +282,7 @@ "computer": "Computer", "confirm-subtask-delete-popup": "Wollen Sie die Teilaufgabe wirklich löschen?", "confirm-checklist-delete-popup": "Wollen Sie diese Checkliste wirklich löschen?", - "subtaskDeletePopup-title": "Delete Subtask?", + "subtaskDeletePopup-title": "Teilaufgabe löschen?", "checklistDeletePopup-title": "Checkliste löschen?", "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage", "copy-text-to-clipboard": "Text in die Zwischenablage kopieren", @@ -706,7 +706,7 @@ "deposit-subtasks-board": "Teilaufgaben in diesem Board ablegen:", "deposit-subtasks-list": "Zielliste für hier abgelegte Teilaufgaben:", "show-parent-in-minicard": "Übergeordnetes Element auf Minikarte anzeigen:", - "description-on-minicard": "Description on minicard", + "description-on-minicard": "Beschreibung auf Minikarte", "prefix-with-full-path": "Vollständiger Pfad über Titel", "prefix-with-parent": "Über Titel", "subtext-with-full-path": "Vollständiger Pfad unter Titel", @@ -1150,5 +1150,5 @@ "copyChecklist": "Checkliste kopieren", "copyChecklistPopup-title": "Checkliste kopieren", "card-show-lists": "Listen anzeigen", - "subtaskActionsPopup-title": "Subtask Actions" + "subtaskActionsPopup-title": "Teilaufgabenaktionen" } \ No newline at end of file From 0d9c37b0067d46669b7258bfff5dfc16d590e1d9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 17:26:39 +0300 Subject: [PATCH 02/13] Fix Can't add attachments because of Content-Security-Policy. Thanks to Ben0it-T and xet7 ! Fixes #4461 --- .meteor/packages | 1 + .meteor/versions | 1 + server/policy.js | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/.meteor/packages b/.meteor/packages index e7be1c582..26b3988df 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -149,3 +149,4 @@ pascoual:pdfkit wekan-accounts-lockout lmieulet:meteor-coverage meteortesting:mocha +browser-policy-content diff --git a/.meteor/versions b/.meteor/versions index 8e372abdf..ba08e059e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -19,6 +19,7 @@ blaze@2.5.0 blaze-tools@1.1.2 boilerplate-generator@1.7.1 browser-policy-common@1.0.11 +browser-policy-content@1.1.1 browser-policy-framing@1.1.0 caching-compiler@1.2.2 caching-html-compiler@1.2.0 diff --git a/server/policy.js b/server/policy.js index a8c33a055..cdd4d3697 100644 --- a/server/policy.js +++ b/server/policy.js @@ -1,6 +1,13 @@ import { BrowserPolicy } from 'meteor/browser-policy-common'; Meteor.startup(() => { + + // Default allowed + BrowserPolicy.content.allowInlineScripts(); + BrowserPolicy.content.allowEval(); + BrowserPolicy.content.allowInlineStyles(); + BrowserPolicy.content.allowSameOriginForAll(); + if (process.env.BROWSER_POLICY_ENABLED === 'true') { // Trusted URL that can embed Wekan in iFrame. const trusted = process.env.TRUSTED_URL; From 5744aac7bf9030acd37ebc2b17aeac84c32cc76c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 17:30:05 +0300 Subject: [PATCH 03/13] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3b5529c5..784279f04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This release fixes the following bugs: Thanks to helioguardabaxo. - [Remove incomplete translated changelogs](https://github.com/wekan/wekan/pull/4455). Thanks to ocdtrekkie. +- [Fix Can't add attachments because of Content-Security-Policy](https://github.com/wekan/wekan/commit/0d9c37b0067d46669b7258bfff5dfc16d590e1d9). + Thanks to Ben0it-T and xet7. Thanks to above GitHub users for their contributions and translators for their translations. From e7a11c57338a15a8fc1e1b74a2446ffd7d4743a7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 17:52:11 +0300 Subject: [PATCH 04/13] Try to fix Duplicate Board. Thanks to xet7 ! Fixes #4459 --- client/components/boards/boardsList.js | 2 +- models/cards.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 467e5686a..7f49df7ab 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -239,7 +239,7 @@ BlazeComponent.extendComponent({ }, (err, res) => { if (err) { - this.setError(err.error); + self.setError(err.error); } else { Session.set('fromBoard', null); subManager.subscribe('board', res, false); diff --git a/models/cards.js b/models/cards.js index 166bbf0cb..5c4fa1762 100644 --- a/models/cards.js +++ b/models/cards.js @@ -4,6 +4,8 @@ import { TYPE_LINKED_BOARD, TYPE_LINKED_CARD, } from '../config/const'; +import Attachments from "./attachments"; + Cards = new Mongo.Collection('cards'); @@ -585,8 +587,8 @@ Cards.helpers({ // Copy attachments oldCard.attachments().forEach(att => { att.cardId = _id; - Attachments.insert(att); delete att._id; + return Attachments.insert(att); }); // copy checklists From 5eca3de00fea31721fa2e10b7d3a6f13ca87f39c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 17:54:20 +0300 Subject: [PATCH 05/13] Try to fix Trello import Attachment and links not defined. Thanks to akhudushin, hatl, 2447254731 and xet7 ! Fixes #4418 --- models/trelloCreator.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/models/trelloCreator.js b/models/trelloCreator.js index b35b8d5d5..3db83ef55 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -1,3 +1,5 @@ +import Attachments from "./attachments"; + const DateString = Match.Where(function(dateAsString) { check(dateAsString, String); return moment(dateAsString, moment.ISO_8601).isValid(); @@ -452,20 +454,22 @@ export class TrelloCreator { } }); - if (links.length) { - let desc = cardToCreate.description.trim(); - if (desc) { - desc += '\n\n'; + if (links !== undefined) { + if (links.length !== undefined) { + let desc = cardToCreate.description.trim(); + if (desc) { + desc += '\n\n'; + } + desc += `## ${TAPi18n.__('links-heading')}\n`; + links.forEach(link => { + desc += `* ${link}\n`; + }); + Cards.direct.update(cardId, { + $set: { + description: desc, + }, + }); } - desc += `## ${TAPi18n.__('links-heading')}\n`; - links.forEach(link => { - desc += `* ${link}\n`; - }); - Cards.direct.update(cardId, { - $set: { - description: desc, - }, - }); } } result.push(cardId); From 0e3d8e8607956de975039049ac5d9f7fd1519091 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 17:57:53 +0300 Subject: [PATCH 06/13] Updated ChangeLog. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 784279f04..53e013f1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ This release fixes the following bugs: Thanks to ocdtrekkie. - [Fix Can't add attachments because of Content-Security-Policy](https://github.com/wekan/wekan/commit/0d9c37b0067d46669b7258bfff5dfc16d590e1d9). Thanks to Ben0it-T and xet7. +- [Try to fix Duplicate Board](https://github.com/wekan/wekan/commit/e7a11c57338a15a8fc1e1b74a2446ffd7d4743a7). + Thanks to xet7. +- [Try to fix Trello import Attachment and links not defined](https://github.com/wekan/wekan/commit/5eca3de00fea31721fa2e10b7d3a6f13ca87f39c). + Thanks to akhudushin, hatl, 2447254731 and xet7. Thanks to above GitHub users for their contributions and translators for their translations. From b7aaff53136141d17df7df4eae9316145d7eec47 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 18:21:49 +0300 Subject: [PATCH 07/13] Updated translations. --- i18n/fr.i18n.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index bc9b963f4..cdd495fb4 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -706,7 +706,7 @@ "deposit-subtasks-board": "Déposer des sous-tâches dans ce tableau :", "deposit-subtasks-list": "Liste de destination pour les sous-tâches déposées ici :", "show-parent-in-minicard": "Voir la carte parente dans la mini-carte :", - "description-on-minicard": "Description on minicard", + "description-on-minicard": "Description sur la mini-carte", "prefix-with-full-path": "Préfixer avec le chemin complet", "prefix-with-parent": "Préfixer avec le parent", "subtext-with-full-path": "Sous-titre avec le chemin complet", @@ -878,7 +878,7 @@ "delete-team-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette équipe ? Cela est irréversible.", "delete-org-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette organisation ? Cela est irréversible.", "accounts-allowUserDelete": "Autoriser les utilisateurs à supprimer leur compte", - "hide-minicard-label-text": "Cacher l'étiquette de la minicarte", + "hide-minicard-label-text": "Cacher l'étiquette de la mini-carte", "show-desktop-drag-handles": "Voir les poignées de déplacement du bureau", "assignee": "Personne assignée", "cardAssigneesPopup-title": "Personne assignée", From 49a996624f3842c243bb72120b95c27d914e02a9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 18:47:27 +0300 Subject: [PATCH 08/13] Comment out Trello attachment import until it's implemented with API key. Thanks to xet7 ! Related #4418 --- models/trelloCreator.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 3db83ef55..3a087565e 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -447,15 +447,17 @@ export class TrelloCreator { }); } }; - if (att.url) { - Attachment.load(att.url, opts, cb, true); - } else if (att.file) { - Attachment.write(att.file, opts, cb, true); - } + // TODO: Add import attachment with Trello API key + // like Python code at wekan/trello/ of https://github.com/wekan/wekan + //if (att.url) { + // Attachment.load(att.url, opts, cb, true); + //} else if (att.file) { + // Attachment.write(att.file, opts, cb, true); + //} }); - if (links !== undefined) { - if (links.length !== undefined) { + if (links) { + if (links.length) { let desc = cardToCreate.description.trim(); if (desc) { desc += '\n\n'; From 5b31e2f2fb59706ee60cf24810ae2bb197fcaa5e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 18:49:55 +0300 Subject: [PATCH 09/13] Updated ChangeLog. --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e013f1b..7dfe5f0a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,10 @@ This release fixes the following bugs: Thanks to Ben0it-T and xet7. - [Try to fix Duplicate Board](https://github.com/wekan/wekan/commit/e7a11c57338a15a8fc1e1b74a2446ffd7d4743a7). Thanks to xet7. -- [Try to fix Trello import Attachment and links not defined](https://github.com/wekan/wekan/commit/5eca3de00fea31721fa2e10b7d3a6f13ca87f39c). +- [Try to fix Trello import Attachment and links not defined. In Progress, does not work yet](https://github.com/wekan/wekan/commit/5eca3de00fea31721fa2e10b7d3a6f13ca87f39c). Thanks to akhudushin, hatl, 2447254731 and xet7. +- [Comment out Trello attachment import until it's implemented with API key](https://github.com/wekan/wekan/commit/49a996624f3842c243bb72120b95c27d914e02a9). + Thanks to xet7. Thanks to above GitHub users for their contributions and translators for their translations. From 4ca7b0dad733099cd6ad15acc69ec436539f7460 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 19:09:25 +0300 Subject: [PATCH 10/13] Try to fix Snap WRITABLE_FILES. Thanks to xet7 ! --- snap-src/bin/config | 8 ++++---- snap-src/bin/mongodb-control | 6 ------ snap-src/bin/wekan-control | 7 +++++++ snap-src/bin/wekan-help | 12 ++++++------ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/snap-src/bin/config b/snap-src/bin/config index ceb5f664f..0693ade00 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -3,11 +3,11 @@ # All supported keys are defined here together with descriptions and default values # list of supported keys -keys="DEBUG WRITABLE_PATH MONGO_LOG_DESTINATION MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM MAIL_SERVICE MAIL_SERVICE_USER MAIL_SERVICE_PASSWORD ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CA_CERT OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS OAUTH2_ADFS_ENABLED LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_AD_SIMPLE_AUTH LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD PASSWORD_LOGIN_ENABLED CAS_ENABLED CAS_BASE_URL CAS_LOGIN_URL CAS_VALIDATE_URL SAML_ENABLED SAML_PROVIDER SAML_ENTRYPOINT SAML_ISSUER SAML_CERT SAML_IDPSLO_REDIRECTURL SAML_PRIVATE_KEYFILE SAML_PUBLIC_CERTFILE SAML_IDENTIFIER_FORMAT SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE SAML_ATTRIBUTES ORACLE_OIM_ENABLED RESULTS_PER_PAGE WAIT_SPINNER NODE_OPTIONS" +keys="DEBUG MONGO_LOG_DESTINATION MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM MAIL_SERVICE MAIL_SERVICE_USER MAIL_SERVICE_PASSWORD ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CA_CERT OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS OAUTH2_ADFS_ENABLED LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_AD_SIMPLE_AUTH LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD PASSWORD_LOGIN_ENABLED CAS_ENABLED CAS_BASE_URL CAS_LOGIN_URL CAS_VALIDATE_URL SAML_ENABLED SAML_PROVIDER SAML_ENTRYPOINT SAML_ISSUER SAML_CERT SAML_IDPSLO_REDIRECTURL SAML_PRIVATE_KEYFILE SAML_PUBLIC_CERTFILE SAML_IDENTIFIER_FORMAT SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE SAML_ATTRIBUTES ORACLE_OIM_ENABLED RESULTS_PER_PAGE WAIT_SPINNER NODE_OPTIONS" -DESCRIPTION_WRITABLE_PATH="Writable path. Default: $SNAP_COMMON/wekan-uploads" -DEFAULT_WRITABLE_PATH="$SNAP_COMMON/wekan-uploads" -KEY_WRITABLE_PATH="writable-path" +#DESCRIPTION_WRITABLE_PATH="Writable path. Default: $SNAP_COMMON/files" +#DEFAULT_WRITABLE_PATH="$SNAP_COMMON/files" +#KEY_WRITABLE_PATH="writable-path" #--------------------------------------------------------------------- # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132 diff --git a/snap-src/bin/mongodb-control b/snap-src/bin/mongodb-control index 31500ca02..444d62f40 100755 --- a/snap-src/bin/mongodb-control +++ b/snap-src/bin/mongodb-control @@ -24,12 +24,6 @@ if test -f "$SNAP_COMMON/mongodb.log"; then rm -f "$SNAP_COMMON/mongodb.log" fi -# If uploads directory does not exist, create it. -# Wekan will store attachments there. -if [ ! -d "${WRITABLE_PATH}" ]; then - mkdir "${WRITABLE_PATH}" -fi - # Alternative: When starting MongoDB, and using logfile, truncate log to last 1000 lines of text. # 1) If file exists: #if test -f "$SNAP_COMMON/mongodb.log"; then diff --git a/snap-src/bin/wekan-control b/snap-src/bin/wekan-control index 86c21e3f3..27138579f 100755 --- a/snap-src/bin/wekan-control +++ b/snap-src/bin/wekan-control @@ -16,6 +16,13 @@ else export MONGO_URL="mongodb://$MONGODB_BIND_IP:$MONGODB_PORT/wekan" fi +# If uploads directory does not exist, create it. +# Wekan will store attachments there. +export WRITABLE_PATH=$SNAP_COMMON/files +if [ ! -d $WRITABLE_PATH ]; then + mkdir $WRITABLE_PATH +fi + echo -e "MONGO_URL=$MONGO_URL" APPLICATION_DIRECTORY=$SNAP APPLICATION_START=main.js diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index 6bd6c11e7..68ea61f73 100755 --- a/snap-src/bin/wekan-help +++ b/snap-src/bin/wekan-help @@ -15,12 +15,12 @@ echo -e "\t$ snap set $SNAP_NAME debug='true'" echo -e "\t-Disable the Debug of Wekan:" echo -e "\t$ snap unset $SNAP_NAME debug" echo -e "\n" -echo -e "Writable path. Snap can not write outside of /var/snap/wekan/common sandbox directory." -echo -e "Default:" -echo -e "\t$ snap set $SNAP_NAME writable-path='\$SNAP_COMMON\uploads'" -echo -e "\t-To set different path, usually not needed:" -echo -e "\t$ snap set $SNAP_NAME writable-path='\$SNAP_COMMON\uploads2'" -echo -e "\n" +#echo -e "Writable path. Snap can not write outside of /var/snap/wekan/common sandbox directory." +#echo -e "Default:" +#echo -e "\t$ snap set $SNAP_NAME writable-path='\$SNAP_COMMON\files'" +#echo -e "\t-To set different path, usually not needed:" +#echo -e "\t$ snap set $SNAP_NAME writable-path='\$SNAP_COMMON\files2'" +#echo -e "\n" echo -e "Mongo log destimation: devnull/snapcommon/syslog. Default: 'devnull'" echo -e "To set different mongo log destination of Wekan:" echo -e "\t$ snap set $SNAP_NAME mongo-log-destination='snapcommon'" From 6dc858d79093934cc19ac758d651b484a4314c6f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 19:15:51 +0300 Subject: [PATCH 11/13] v6.16 --- 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 7dfe5f0a8..b5ec67ee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# Upcoming WeKan ® release +# v6.16 2022-04-06 WeKan ® release This release fixes the following bugs: @@ -16,6 +16,8 @@ This release fixes the following bugs: Thanks to akhudushin, hatl, 2447254731 and xet7. - [Comment out Trello attachment import until it's implemented with API key](https://github.com/wekan/wekan/commit/49a996624f3842c243bb72120b95c27d914e02a9). Thanks to xet7. +- [Try to fix Snap WRITABLE_FILES](https://github.com/wekan/wekan/commit/4ca7b0dad733099cd6ad15acc69ec436539f7460). + Thanks to xet7. Thanks to above GitHub users for their contributions and translators for their translations. diff --git a/Stackerfile.yml b/Stackerfile.yml index 95c721ea8..65f26f0de 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v6.15.0" +appVersion: "v6.16.0" files: userUploads: - README.md diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 7b915719c..cee02e950 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "6.15" +appVersion: "6.16" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 63a47e7f0..4ee4772fe 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v6.15 + tag: v6.16 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/package-lock.json b/package-lock.json index 0215235c1..f0ddfc846 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.15.0", + "version": "v6.16.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1ab8f6577..7d81b1ed6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.15.0", + "version": "v6.16.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index efe03610c..7256632a3 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v6.15 + Wekan REST API v6.16 @@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - Wekan REST API v6.15 + Wekan REST API v6.16
    • @@ -2156,7 +2156,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v6.15

    +

    Wekan REST API v6.16

    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 7da530820..bba287884 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v6.15 + version: v6.16 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 22b531905..4cca5d513 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 = 615, + appVersion = 616, # Increment this for every release. - appMarketingVersion = (defaultText = "6.15.0~2022-04-05"), + appMarketingVersion = (defaultText = "6.16.0~2022-04-06"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 1713b91b9..8412df20f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '6.15' +version: '6.16' summary: Open Source kanban description: | WeKan ® is an Open Source and collaborative kanban board application. From f613a5875fbc600292f6821776d957c7221bcd0a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 19:33:34 +0300 Subject: [PATCH 12/13] Updated dependencies. --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0ddfc846..0d3dac266 100644 --- a/package-lock.json +++ b/package-lock.json @@ -194,9 +194,9 @@ "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==" }, "@babel/runtime": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", - "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz", + "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 7d81b1ed6..b9ed1551b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@babel/core": "^7.15.0", - "@babel/runtime": "^7.15.3", + "@babel/runtime": "^7.17.9", "@wekanteam/markdown-it-mermaid": "^0.5.3", "ajv": "^8.10.0", "babel-runtime": "^6.26.0", From 37fdde183555389b5b22183062af6e833c186c82 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Apr 2022 19:37:49 +0300 Subject: [PATCH 13/13] v6.17 --- CHANGELOG.md | 9 +++++++++ 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, 21 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5ec67ee5..e94e130a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) +# v6.17 2022-04-06 WeKan ® release + +This release adds the following updates: + +- [Updated dependencies](https://github.com/wekan/wekan/commit/f613a5875fbc600292f6821776d957c7221bcd0a). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v6.16 2022-04-06 WeKan ® release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 65f26f0de..9449f7c8f 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v6.16.0" +appVersion: "v6.17.0" files: userUploads: - README.md diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index cee02e950..16068f8cc 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "6.16" +appVersion: "6.17" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 4ee4772fe..4cfd6f782 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v6.16 + tag: v6.17 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/package-lock.json b/package-lock.json index 0d3dac266..62057ccc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.16.0", + "version": "v6.17.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b9ed1551b..b59d4df0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.16.0", + "version": "v6.17.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 7256632a3..95548b327 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v6.16 + Wekan REST API v6.17 @@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    • - Wekan REST API v6.16 + Wekan REST API v6.17
      • @@ -2156,7 +2156,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
      -

      Wekan REST API v6.16

      +

      Wekan REST API v6.17

      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 bba287884..20245b5d1 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v6.16 + version: v6.17 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 4cca5d513..35a1867c3 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 = 616, + appVersion = 617, # Increment this for every release. - appMarketingVersion = (defaultText = "6.16.0~2022-04-06"), + appMarketingVersion = (defaultText = "6.17.0~2022-04-06"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 8412df20f..300d4e3ab 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '6.16' +version: '6.17' summary: Open Source kanban description: | WeKan ® is an Open Source and collaborative kanban board application.