Merge branch 'master' of https://github.com/wekan/wekan into new-search

CHANGELOG.md

@@ -1,9 +1,20 @@
-# Upcoming Wekan release
+# v4.85 2021-01-23 Wekan release
 
 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 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:
 
@@ -20,6 +31,10 @@ 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.
+- [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.
 

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

client/components/main/myCards.styl

@@ -1,14 +1,14 @@
 .my-cards-board-wrapper
-  border-radius: 8px
+  border-radius: 0 0 4px 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
-
+  border-width: 2px
+  border-style: solid
+  border-color: #a2a2a2
+  
 .my-cards-board-title
   font-size: 1.4rem
   font-weight: bold

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",
+  "automatically-field-on-card": "Füge Feld neuen Karten hinzu",
-  "always-field-on-card": "Add field to all cards",
+  "always-field-on-card": "Füge Feld allen Karten hinzu",
   "showLabel-field-on-card": "Feldbezeichnung auf Minikarte anzeigen",
   "yes": "Ja",
   "no": "Nein",

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",
+  "automatically-field-on-card": "Voeg veld toe aan nieuwe kaarten",
-  "always-field-on-card": "Add field to all cards",
+  "always-field-on-card": "Voeg veld toe aan alle kaarten",
   "showLabel-field-on-card": "Toon veldnaam op minikaart",
   "yes": "Ja",
   "no": "Nee",

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",
+  "automatically-field-on-card": "Adicionar campo aos novos cartões",
-  "always-field-on-card": "Add field to all cards",
+  "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",

i18n/ru.i18n.json

@@ -601,8 +601,8 @@
   "minutes": "минуты",
   "seconds": "секунды",
   "show-field-on-card": "Показать это поле на карточке",
-  "automatically-field-on-card": "Add field to new cards",
+  "automatically-field-on-card": "Добавить поле на новую карточку",
-  "always-field-on-card": "Add field to all cards",
+  "always-field-on-card": "Добавить поле на все карточки",
   "showLabel-field-on-card": "Показать имя поля на карточке",
   "yes": "Да",
   "no": "Нет",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.84.0",
+  "version": "v4.85.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.84.0",
+  "version": "v4.85.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.84">Wekan REST API v4.84</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.85">Wekan REST API v4.85</a>
             
           </li>
         
@@ -1982,7 +1982,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 v4.84</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v4.85</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>
@@ -7706,6 +7706,7 @@ System.out.println(response.toString());
   },
   <span class="hljs-attr">"showOnCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"automaticallyOnCard"</span>: <span class="hljs-literal">true</span>,
+  <span class="hljs-attr">"alwaysOnCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"showLabelOnMiniCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"createdAt"</span>: <span class="hljs-string">"string"</span>,
   <span class="hljs-attr">"modifiedAt"</span>: <span class="hljs-string">"string"</span>
@@ -13992,6 +13993,7 @@ UserSecurity
   },
   <span class="hljs-attr">"showOnCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"automaticallyOnCard"</span>: <span class="hljs-literal">true</span>,
+  <span class="hljs-attr">"alwaysOnCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"showLabelOnMiniCard"</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">"createdAt"</span>: <span class="hljs-string">"string"</span>,
   <span class="hljs-attr">"modifiedAt"</span>: <span class="hljs-string">"string"</span>
@@ -14054,6 +14056,13 @@ UserSecurity
 <td>should the custom fields automatically be added on cards?</td>
 </tr>
 <tr>
+<td>alwaysOnCard</td>
+<td>boolean</td>
+<td>true</td>
+<td>none</td>
+<td>should the custom field be automatically added to all cards?</td>
+</tr>
+<tr>
 <td>showLabelOnMiniCard</td>
 <td>boolean</td>
 <td>true</td>

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:

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,