From 7909af6a5686bb804bd101f716c04a7c815f6f22 Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sat, 23 Jan 2021 11:55:09 -0300 Subject: [PATCH 1/9] Remove border and add box-shadow in boards to My Cards --- client/components/main/myCards.styl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/components/main/myCards.styl b/client/components/main/myCards.styl index 2126295b6..0bf7637b7 100644 --- a/client/components/main/myCards.styl +++ b/client/components/main/myCards.styl @@ -1,15 +1,14 @@ .my-cards-board-wrapper - border-radius: 8px + border-radius: 4px //padding: 0.5rem min-width: 400px - border-width: 8px - border-color: grey - border-style: solid margin-bottom: 2rem margin-right: auto margin-left: auto + box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 6px, rgba(0, 0, 0, 0.23) 0px 3px 6px; .my-cards-board-title + border-radius: 4px 4px 0 0; font-size: 1.4rem font-weight: bold padding: 0.5rem From 5346f89f77fb2e921b0fc5cc45fd2c9ca9785993 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 17:05:18 +0200 Subject: [PATCH 2/9] Updated ChangeLog. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eaba58ba..4534bcb40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ This release adds the following new features: - [Option to add custom field to all cards](https://github.com/wekan/wekan/pulls/3466). Thanks to jrsupplee. +- [Added board title link and background color to My Cards](https://github.com/wekan/wekan/pull/3471). + Thanks to helioguardabaxo. +- [Added checkbox as an option to custom field create dialog](https://github.com/wekan/wekan/pull/3472). + Thanks to jrsupplee. +- [Display My Cards lists using inline-grid](https://github.com/wekan/wekan/pull/3474). + Thanks to jrsupplee. and adds the following updates: @@ -20,6 +26,8 @@ and fixes the following bugs: Thanks to jrsupplee and xet7. - [Fix for search operators with uppercase letters](https://github.com/wekan/wekan/pull/3470). Thanks to jrsupplee. +- [Boards.copyTitle - escape string used in regex](https://github.com/wekan/wekan/pull/3473). + Thanks to jrsupplee. Thanks to above GitHub users for their contributions and translators for their translations. From 0c5426076240a9e0915a20d0fef16daf4f26eeff Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 17:09:18 +0200 Subject: [PATCH 3/9] Updated translations. --- i18n/de.i18n.json | 4 ++-- i18n/nl.i18n.json | 4 ++-- i18n/pt-BR.i18n.json | 6 +++--- i18n/ru.i18n.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index eba6d8d7b..4e60448e9 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -601,8 +601,8 @@ "minutes": "Minuten", "seconds": "Sekunden", "show-field-on-card": "Zeige dieses Feld auf der Karte", - "automatically-field-on-card": "Add field to new cards", - "always-field-on-card": "Add field to all cards", + "automatically-field-on-card": "Füge Feld neuen Karten hinzu", + "always-field-on-card": "Füge Feld allen Karten hinzu", "showLabel-field-on-card": "Feldbezeichnung auf Minikarte anzeigen", "yes": "Ja", "no": "Nein", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 47258f0c6..9cdedf28a 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -601,8 +601,8 @@ "minutes": "minuten", "seconds": "seconden", "show-field-on-card": "Toon dit veld op kaart", - "automatically-field-on-card": "Add field to new cards", - "always-field-on-card": "Add field to all cards", + "automatically-field-on-card": "Voeg veld toe aan nieuwe kaarten", + "always-field-on-card": "Voeg veld toe aan alle kaarten", "showLabel-field-on-card": "Toon veldnaam op minikaart", "yes": "Ja", "no": "Nee", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index b4983a19b..0b3c715c6 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -601,8 +601,8 @@ "minutes": "minutos", "seconds": "segundos", "show-field-on-card": "Mostrar este campo no cartão", - "automatically-field-on-card": "Add field to new cards", - "always-field-on-card": "Add field to all cards", + "automatically-field-on-card": "Adicionar campo aos novos cartões", + "always-field-on-card": "Adicionar campo a todos os cartões", "showLabel-field-on-card": "Mostrar etiqueta do campo no minicartão", "yes": "Sim", "no": "Não", @@ -860,7 +860,7 @@ "context-separator": "/", "myCardsSortChange-title": "Ordenar Meus Cartões", "myCardsSortChangePopup-title": "Ordenar Meus Cartões", - "myCardsSortChange-choice-board": "por Quadro", + "myCardsSortChange-choice-board": "Por Quadro", "myCardsSortChange-choice-dueat": "Por Prazo Final", "dueCards-title": "Cartões com prazo final", "dueCardsViewChange-title": "Visão de Cartões com prazo final", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 1eb54d414..d805a65d7 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -601,8 +601,8 @@ "minutes": "минуты", "seconds": "секунды", "show-field-on-card": "Показать это поле на карточке", - "automatically-field-on-card": "Add field to new cards", - "always-field-on-card": "Add field to all cards", + "automatically-field-on-card": "Добавить поле на новую карточку", + "always-field-on-card": "Добавить поле на все карточки", "showLabel-field-on-card": "Показать имя поля на карточке", "yes": "Да", "no": "Нет", From 66f5f254d066bf22b62de0ecd88a2767489c6269 Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sat, 23 Jan 2021 12:43:11 -0300 Subject: [PATCH 4/9] Remove box-shadow in board to My Cards --- client/components/main/myCards.styl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/components/main/myCards.styl b/client/components/main/myCards.styl index 0bf7637b7..1929906df 100644 --- a/client/components/main/myCards.styl +++ b/client/components/main/myCards.styl @@ -1,14 +1,15 @@ .my-cards-board-wrapper - border-radius: 4px + border-radius: 0 0 4px 4px; //padding: 0.5rem min-width: 400px margin-bottom: 2rem margin-right: auto margin-left: auto - box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 6px, rgba(0, 0, 0, 0.23) 0px 3px 6px; - + border-width: 2px + border-style: solid + border-color: #a2a2a2 + .my-cards-board-title - border-radius: 4px 4px 0 0; font-size: 1.4rem font-weight: bold padding: 0.5rem From 7a5aad9cd825ef58fa0eb26602dea7510fbdef36 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 17:47:38 +0200 Subject: [PATCH 5/9] Updated ChangeLog. --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4534bcb40..12c8096eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,17 @@ This release adds the following new features: - [Option to add custom field to all cards](https://github.com/wekan/wekan/pulls/3466). Thanks to jrsupplee. -- [Added board title link and background color to My Cards](https://github.com/wekan/wekan/pull/3471). - Thanks to helioguardabaxo. - [Added checkbox as an option to custom field create dialog](https://github.com/wekan/wekan/pull/3472). Thanks to jrsupplee. + +and adds the following improvements: + - [Display My Cards lists using inline-grid](https://github.com/wekan/wekan/pull/3474). Thanks to jrsupplee. +- [Added board title link and background color to My Cards](https://github.com/wekan/wekan/pull/3471). + Thanks to helioguardabaxo. +- [Use simple border at My Cards](https://github.com/wekan/wekan/pull/3475). + Thanks to helioguardabaxo. and adds the following updates: From 082b16d422435957827760aeb948d50d7cdc53ee Mon Sep 17 00:00:00 2001 From: "John R. Supplee" Date: Sat, 23 Jan 2021 18:15:08 +0200 Subject: [PATCH 6/9] Bug fix: import regex escape function --- models/boards.js | 1 + 1 file changed, 1 insertion(+) diff --git a/models/boards.js b/models/boards.js index 35b00ee75..f4f0d8042 100644 --- a/models/boards.js +++ b/models/boards.js @@ -1,3 +1,4 @@ +const escapeForRegex = require('escape-string-regexp'); Boards = new Mongo.Collection('boards'); /** From d1c3c85af8339576951a21e7057e831d528378a5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 18:54:33 +0200 Subject: [PATCH 7/9] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c8096eb..480452db1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,8 @@ and fixes the following bugs: Thanks to jrsupplee. - [Boards.copyTitle - escape string used in regex](https://github.com/wekan/wekan/pull/3473). Thanks to jrsupplee. +- [Bug fix: import regex escape function](https://github.com/wekan/wekan/pull/3476). + Thanks to jrsupplee. Thanks to above GitHub users for their contributions and translators for their translations. From ae1269aa681bbd0954978f46495ef2efa71fcdd9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 19:18:18 +0200 Subject: [PATCH 8/9] Updated translations. From 5b194285f51cab384dcc6e9a98672ba640233111 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Jan 2021 21:14:06 +0200 Subject: [PATCH 9/9] v4.85 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- public/api/wekan.html | 13 +++++++++++-- public/api/wekan.yml | 7 ++++++- sandstorm-pkgdef.capnp | 4 ++-- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 480452db1..b576e7262 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v4.85 2021-01-23 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index f7299e6b6..70ba308e4 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v4.84.0" +appVersion: "v4.85.0" files: userUploads: - README.md diff --git a/package-lock.json b/package-lock.json index 627d3f900..5d6a605d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v4.84.0", + "version": "v4.85.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3d288bab9..d4737b4dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v4.84.0", + "version": "v4.85.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 33a191e17..993fc5a1c 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - Wekan REST API v4.84 + Wekan REST API v4.85
    • @@ -1982,7 +1982,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v4.84

    +

    Wekan REST API v4.85

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

    @@ -7706,6 +7706,7 @@ System.out.println(response.toString()); }, "showOnCard": true, "automaticallyOnCard": true, + "alwaysOnCard": true, "showLabelOnMiniCard": true, "createdAt": "string", "modifiedAt": "string" @@ -13992,6 +13993,7 @@ UserSecurity }, "showOnCard": true, "automaticallyOnCard": true, + "alwaysOnCard": true, "showLabelOnMiniCard": true, "createdAt": "string", "modifiedAt": "string" @@ -14054,6 +14056,13 @@ UserSecurity should the custom fields automatically be added on cards? +alwaysOnCard +boolean +true +none +should the custom field be automatically added to all cards? + + showLabelOnMiniCard boolean true diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 49ff25066..98dcae9f1 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v4.84 + version: v4.85 description: | The REST API allows you to control and extend Wekan with ease. @@ -2392,6 +2392,10 @@ definitions: description: | should the custom fields automatically be added on cards? type: boolean + alwaysOnCard: + description: | + should the custom field be automatically added to all cards? + type: boolean showLabelOnMiniCard: description: | should the label of the custom field be shown on minicards? @@ -2408,6 +2412,7 @@ definitions: - settings - showOnCard - automaticallyOnCard + - alwaysOnCard - showLabelOnMiniCard - modifiedAt CustomFieldsSettings: diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 34e7b3619..1e06c2ef7 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 = 484, + appVersion = 485, # Increment this for every release. - appMarketingVersion = (defaultText = "4.84.0~2021-01-22"), + appMarketingVersion = (defaultText = "4.85.0~2021-01-23"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,