From f18658c0d220d5563dc64e456ab776c546c7100a Mon Sep 17 00:00:00 2001 From: Emile NDAGIJIMANA Date: Thu, 25 Nov 2021 16:01:43 +0100 Subject: [PATCH 01/11] Fix bug from issue #4173 --- client/components/main/header.jade | 3 ++- client/components/main/header.js | 16 ++++++++++++++++ client/components/main/header.styl | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/client/components/main/header.jade b/client/components/main/header.jade index 08afdb6c1..b75f8fcd5 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -38,7 +38,8 @@ template(name="header") unless currentSetting.customTopLeftCornerLogoLinkUrl img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}") unless currentSetting.customTopLeftCornerLogoImageUrl - img(src="{{pathFor '/logo-header.png'}}" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}") + div#headerIsSettingDatabaseCallDone + img(src="{{pathFor '/logo-header.png'}}" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}") span.allBoards a(href="{{pathFor 'home'}}") span.fa.fa-home diff --git a/client/components/main/header.js b/client/components/main/header.js index 848f9f2cc..7e3f0166d 100644 --- a/client/components/main/header.js +++ b/client/components/main/header.js @@ -1,7 +1,23 @@ Meteor.subscribe('user-admin'); Meteor.subscribe('boards'); Meteor.subscribe('setting'); +Template.header.onCreated(function(){ + const templateInstance = this; + templateInstance.currentSetting = new ReactiveVar(); + templateInstance.isLoading = new ReactiveVar(false); + Meteor.subscribe('setting', { + onReady() { + templateInstance.currentSetting.set(Settings.findOne()); + let currSetting = templateInstance.currentSetting.curValue; + if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined && document.getElementById("headerIsSettingDatabaseCallDone") != null) + document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'none'; + else if(document.getElementById("headerIsSettingDatabaseCallDone") != null) + document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'block'; + return this.stop(); + }, + }); +}); Template.header.helpers({ wrappedHeader() { return !Session.get('currentBoard'); diff --git a/client/components/main/header.styl b/client/components/main/header.styl index daf9a7ba6..eaca2d765 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -250,3 +250,6 @@ p margin: 7px padding: 0 + +#headerIsSettingDatabaseCallDone + display: none; From fae4d0be085fd86f681344f1dbb43ad5d25eca83 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 17 Nov 2021 16:55:28 +0100 Subject: [PATCH 02/11] Fix label width oversize bug Happens at Firefox zoom level 90%, probably on Windows... Fixes: https://github.com/wekan/wekan/pull/4073#issuecomment-971563178 --- client/components/cards/labels.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl index aa00a28b7..700ff1044 100644 --- a/client/components/cards/labels.styl +++ b/client/components/cards/labels.styl @@ -146,6 +146,7 @@ height: 25px margin: 0px 3% 7px 0px width: 10.5% + max-width: 10.5% cursor: pointer .edit-labels From 2e8323ca6a9a419b244da63d4fac316ad317a043 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 06:37:44 +0200 Subject: [PATCH 03/11] Updated ChangeLog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d563cec90..035a00d31 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 label width oversize bug](https://github.com/wekan/wekan/pull/4157). + Thanks to mfilser. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v5.78 2021-11-17 WeKan ® release This release fixes the following bugs: From 6944a20ba42e939fa2f34430e59ff19dd1d44047 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 06:42:06 +0200 Subject: [PATCH 04/11] Updated translations. --- i18n/de-CH.i18n.json | 10 +++++----- i18n/zh-CN.i18n.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/i18n/de-CH.i18n.json b/i18n/de-CH.i18n.json index 4cc93a61a..776f92b7a 100644 --- a/i18n/de-CH.i18n.json +++ b/i18n/de-CH.i18n.json @@ -106,7 +106,7 @@ "and-n-other-card_plural": "und __count__ andere Karten", "apply": "Übernehmen", "app-is-offline": "Laden, bitte warten. Das Aktualisieren der Seite führt zu Datenverlust. Wenn das Laden nicht funktioniert, überprüfen Sie bitte, ob der Server nicht angehalten wurde.", - "app-try-reconnect": "Try to reconnect.", + "app-try-reconnect": "Versuch die Verbindung wiederherzustellen.", "archive": "Ins Archiv verschieben", "archive-all": "Alles ins Archiv verschieben", "archive-board": "Board ins Archiv verschieben", @@ -1115,8 +1115,8 @@ "Node_memory_usage_heap_total": "Node memory usage: total size of the allocated heap", "Node_memory_usage_heap_used": "Node memory usage: actual memory used", "Node_memory_usage_external": "Node memory usage: external", - "add-organizations": "Add organizations", - "add-organizations-label": "Added organizations are displayed below:", - "remove-organization-from-board": "Are you sure you want to remove this organization from this board ?", - "to-create-organizations-contact-admin": "To create organizations, please contact administrator." + "add-organizations": "Organisation hinzufügen", + "add-organizations-label": "Hinzugefügte Organisationen werden nachfolgend angezeigt:", + "remove-organization-from-board": "Sind Sie sicher, das Sie diese Organisation von diesem Board entfernen möchten?", + "to-create-organizations-contact-admin": "Um Organisationen anzulegen, kontaktieren Sie sich bitte an den Administrator." } \ No newline at end of file diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index ede100629..de1929cd1 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -1118,5 +1118,5 @@ "add-organizations": "新建组织", "add-organizations-label": "已添加组织如下面列表所示：", "remove-organization-from-board": "请确认是否删除面板上此组织？此操作无法撤销。", - "to-create-organizations-contact-admin": "To create organizations, please contact administrator." + "to-create-organizations-contact-admin": "请联系管理员创建组织。" } \ No newline at end of file From 38eccdb95b12f1eb6068a8d70dccad9aea76b996 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 17 Nov 2021 15:31:06 +0100 Subject: [PATCH 05/11] Fixed label popup at desktop view (add and remove labels) Fixes: #4156 --- client/components/cards/labels.js | 2 +- models/cards.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/components/cards/labels.js b/client/components/cards/labels.js index 4027076d7..f2c373126 100644 --- a/client/components/cards/labels.js +++ b/client/components/cards/labels.js @@ -78,7 +78,7 @@ BlazeComponent.extendComponent({ return [ { 'click .js-select-label'(event) { - const card = Utils.getCurrentCard(); + const card = this.data(); const labelId = this.currentData()._id; card.toggleLabel(labelId); event.preventDefault(); diff --git a/models/cards.js b/models/cards.js index d57827f28..ac412ce77 100644 --- a/models/cards.js +++ b/models/cards.js @@ -2016,6 +2016,7 @@ Cards.mutations({ }, addLabel(labelId) { + this.labelIds.push(labelId); return { $addToSet: { labelIds: labelId, @@ -2024,6 +2025,7 @@ Cards.mutations({ }, removeLabel(labelId) { + this.labelIds = _.without(this.labelIds, labelId); return { $pull: { labelIds: labelId, From 32646fb9bee23c44bbd8187ee2c2002eb61c930a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 15:43:56 +0200 Subject: [PATCH 06/11] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 035a00d31..753db68e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ This release fixes the following bugs: - [Fix label width oversize bug](https://github.com/wekan/wekan/pull/4157). Thanks to mfilser. +- [Fixed label popup at desktop view (add and remove labels)](https://github.com/wekan/wekan/pull/4170). + Thanks to mfilser. Thanks to above GitHub users for their contributions and translators for their translations. From ed13a3b95f519455f42474d5a1d1a58ed0dfb264 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 15:52:24 +0200 Subject: [PATCH 07/11] v5.79 --- 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 753db68e7..7a1967be5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# Upcoming WeKan ® release +# # v5.79 2021-11-25 WeKan ® release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 247eb676c..6a42fbc79 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v5.78.0" +appVersion: "v5.79.0" files: userUploads: - README.md diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 2ba9a693e..3f51be82c 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "5.78" +appVersion: "5.79" dependencies: - condition: mongodb.enabled name: mongodb diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 321287325..9f3cae4ab 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v5.78 + tag: v5.79 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/package-lock.json b/package-lock.json index aa65cc598..aa323f882 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.78.0", + "version": "v5.79.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 71990b513..0ea0e6779 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v5.78.0", + "version": "v5.79.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 497ffc209..3f15adbfc 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v5.78 + Wekan REST API v5.79 @@ -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.78 + Wekan REST API v5.79
    • @@ -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.78

    +

    Wekan REST API v5.79

    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 771e2c55f..3f65189e8 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.78 + version: v5.79 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 2b38357a1..22bef1b34 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 = 578, + appVersion = 579, # Increment this for every release. - appMarketingVersion = (defaultText = "5.78.0~2021-11-17"), + appMarketingVersion = (defaultText = "5.79.0~2021-11-25"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 249e92aa6..6e25d5b1f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '5.78' +version: '5.79' summary: Open Source kanban description: | WeKan ® is an Open Source and collaborative kanban board application. From 44c3449ab213c00e26224cf42833c37dac7fe683 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 16:00:42 +0200 Subject: [PATCH 08/11] Fix typo. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a1967be5..65c86ad47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) -# # v5.79 2021-11-25 WeKan ® release +# v5.79 2021-11-25 WeKan ® release This release fixes the following bugs: From 16bb65f7c7e76b92d1688f23d05c4cc023bd13b9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 16:27:07 +0200 Subject: [PATCH 09/11] Docker build script to be executeable. Thanks to xet7 ! --- releases/docker-build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 releases/docker-build.sh diff --git a/releases/docker-build.sh b/releases/docker-build.sh old mode 100644 new mode 100755 From 8662fd59fbb330818829bdff01ef000e9c8bca15 Mon Sep 17 00:00:00 2001 From: Emile NDAGIJIMANA Date: Thu, 25 Nov 2021 19:30:49 +0100 Subject: [PATCH 10/11] possibility of adding a custom legal notice page url --- client/components/main/layouts.jade | 5 +++++ client/components/main/layouts.js | 9 +++++++++ client/components/main/layouts.styl | 5 +++++ client/components/settings/settingBody.jade | 4 ++++ client/components/settings/settingBody.js | 6 ++++++ i18n/en.i18n.json | 5 ++++- i18n/fr.i18n.json | 7 +++++-- models/settings.js | 4 ++++ server/publications/settings.js | 1 + 9 files changed, 43 insertions(+), 3 deletions(-) diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index bcaf0c026..197e64645 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -48,6 +48,11 @@ template(name="userFormsLayout") +Template.dynamic(template=content) if currentSetting.displayAuthenticationMethod +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod) + if isLegalNoticeLinkExist + div#legalNoticeDiv + span {{_ 'acceptance_of_our_legalNotice'}} + a.at-link(href="{{currentSetting.legalNotice}}", target="_blank", rel="noopener noreferrer") + | {{_ 'legalNotice'}} div.at-form-lang select.select-lang.js-userform-set-language each languages diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index e1361fa43..2ed92989c 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -77,6 +77,15 @@ Template.userFormsLayout.helpers({ // return isSettingDatabaseFctCallDone; // }, + isLegalNoticeLinkExist(){ + const currSet = Template.instance().currentSetting.get(); + if(currSet && currSet !== undefined && currSet != null){ + return currSet.legalNotice !== undefined && currSet.legalNotice.trim() != ""; + } + else + return false; + }, + isLoading() { return Template.instance().isLoading.get(); }, diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 735f48704..b265ff9c1 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -545,3 +545,8 @@ a #isSettingDatabaseCallDone display: none; + +.at-link + color: #17683a; + text-decoration: underline; + text-decoration-color: #17683a; diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index 5fc5e5e8b..775891eea 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -188,6 +188,10 @@ template(name='layoutSettings') .title {{_ 'can-invite-if-same-mailDomainName'}} .form-group input.wekan-form-control#mailDomainNamevalue(type="text", placeholder="" value="{{currentSetting.mailDomainName}}") + li.layout-form + .title {{_ 'custom-legal-notice-link-url'}} + .form-group + input.wekan-form-control#legalNoticevalue(type="text", placeholder="" value="{{currentSetting.legalNotice}}") li.layout-form .title {{_ 'display-authentication-method'}} .form-group.flex diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index c74d93d65..71a286fdb 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -210,6 +210,11 @@ BlazeComponent.extendComponent({ ) .val() .trim(); + const legalNotice = $( + '#legalNoticevalue', + ) + .val() + .trim(); const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true'; const displayAuthenticationMethod = $('input[name=displayAuthenticationMethod]:checked').val() === 'true'; @@ -234,6 +239,7 @@ BlazeComponent.extendComponent({ spinnerName, oidcBtnText, mailDomainName, + legalNotice, }, }); } catch (e) { diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 3b8ed77a4..8e6170397 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -1119,5 +1119,8 @@ "add-organizations": "Add organizations", "add-organizations-label": "Added organizations are displayed below:", "remove-organization-from-board": "Are you sure you want to remove this organization from this board ?", - "to-create-organizations-contact-admin": "To create organizations, please contact administrator." + "to-create-organizations-contact-admin": "To create organizations, please contact administrator.", + "custom-legal-notice-link-url": "Custom legal notice page URL", + "acceptance_of_our_legalNotice": "By continuing, you accept our", + "legalNotice": "legal notice" } diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 41f289e22..2d0ef357e 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -1118,5 +1118,8 @@ "add-organizations": "Ajouter des organisations", "add-organizations-label": "Les organisations ajoutées sont affichées ci-dessous :", "remove-organization-from-board": "Voulez-vous vraiment supprimer cette organisation de ce tableau ?", - "to-create-organizations-contact-admin": "Pour créer des organisations, veuillez contacter l'administrateur." -} \ No newline at end of file + "to-create-organizations-contact-admin": "Pour créer des organisations, veuillez contacter l'administrateur.", + "custom-legal-notice-link-url": "URL de la page des mentions légales personnalisées", + "acceptance_of_our_legalNotice": "En continuant, vous acceptez nos", + "legalNotice": "mentions légales" +} diff --git a/models/settings.js b/models/settings.js index db401f48d..0fbf448e4 100644 --- a/models/settings.js +++ b/models/settings.js @@ -92,6 +92,10 @@ Settings.attachSchema( type: String, optional: true, }, + legalNotice: { + type: String, + optional: true, + }, createdAt: { type: Date, denyUpdate: true, diff --git a/server/publications/settings.js b/server/publications/settings.js index e54b56ddb..f7ee33f32 100644 --- a/server/publications/settings.js +++ b/server/publications/settings.js @@ -26,6 +26,7 @@ Meteor.publish('setting', () => { spinnerName: 1, oidcBtnText: 1, mailDomainName: 1, + legalNotice: 1, }, }, ); From dbef7e7cd3f09900fe9e18a3c7ce432a0a6e17ee Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 25 Nov 2021 23:34:06 +0200 Subject: [PATCH 11/11] Restored ChangeLog. --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c86ad47..bdd760416 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac) +# Upcoming WeKan ® release + +This release adds the following new features: + +- [Show helper at label drag/drop if label popup opened from card details popup](https://github.com/wekan/wekan/pull/4176). + Thanks to mfilser. + +and adds the following updates: + +- [Docker build script to be executeable](https://github.com/wekan/wekan/commit/8054f2b0025c4cb3f6a3ddf71754ae7c707d6ac0). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v5.79 2021-11-25 WeKan ® release This release fixes the following bugs: