Merge branch 'edge' into meteor-1.8

12 files changed, 47 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f399341..396ad7d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v2.70 2019-05-11 Wekan release
+
+This release adds the following new features:
+
+- [View markdown on List names, Custom Fields (Text and Dropdown), Label names,
+  All Boards view Board names and Board descriptions](https://github.com/wekan/wekan/commit/b795115042c2eb6bccbf029f21d78849a44128ca).
+  Related [#2334](https://github.com/wekan/wekan/issues/2334).
+  Thanks to shaygover and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.69 2019-05-11 Wekan release
 
 This release fixes the following translation names:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 31b0cdbc..d257b2c1 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.69.0"
+appVersion: "v2.70.0"
 files:
   userUploads:
     - README.md
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 0739def6..85f47963 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -18,11 +18,15 @@ template(name="boardList")
           else
             a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
               span.details
-                span.board-list-item-name= title
+                span.board-list-item-name
+                  +viewer
+                    = title
                 i.fa.js-star-board(
                   class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                   title="{{_ 'star-board-title'}}")
-                p.board-list-item-desc= description
+                p.board-list-item-desc
+                  +viewer
+                    = description
                 if hasSpentTimeCards
                   i.fa.js-has-spenttime-cards(
                     class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade
index 65081e3b..c4fa6863 100644
--- a/client/components/cards/cardCustomFields.jade
+++ b/client/components/cards/cardCustomFields.jade
@@ -4,9 +4,10 @@ template(name="cardCustomFieldsPopup")
             li.item(class="")
                 a.name.js-select-field(href="#")
                     span.full-name
+                      +viewer
                         = name
                     if hasCustomField
-                        i.fa.fa-check
+                      i.fa.fa-check
     hr
     a.quiet-button.full.js-settings
         i.fa.fa-cog
@@ -61,9 +62,13 @@ template(name="cardCustomField-dropdown")
             select.inline
                 each items
                     if($eq data.value this._id)
-                        option(value=_id selected="selected") {{name}}
+                        option(value=_id selected="selected")
+                          +viewer
+                            = name
                     else
-                        option(value=_id) {{name}}
+                        option(value=_id)
+                          +viewer
+                            = name
             .edit-controls.clearfix
                 button.primary(type="submit") {{_ 'save'}}
                 a.fa.fa-times-thin.js-close-inlined-form
@@ -73,4 +78,4 @@ template(name="cardCustomField-dropdown")
                     +viewer
                         = selectedItem
                 else
-                    | {{_ 'edit'}}
\ No newline at end of file
+                    | {{_ 'edit'}}
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 88f97adc..13b6bd13 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -77,7 +77,9 @@ template(name="cardDetails")
         h3.card-details-item-title {{_ 'labels'}}
         a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
           each labels
-            span.card-label(class="card-label-{{color}}" title=name)= name
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
         if canModifyCard
           a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
             i.fa.fa-plus
@@ -86,7 +88,8 @@ template(name="cardDetails")
       each customFieldsWD
         .card-details-item.card-details-item-customfield
           h3.card-details-item-title
-            = definition.name
+            +viewer
+              = definition.name
           +cardCustomField
 
     .card-details-items
diff --git a/client/components/cards/labels.jade b/client/components/cards/labels.jade
index 6c6efb08..48e28b34 100644
--- a/client/components/cards/labels.jade
+++ b/client/components/cards/labels.jade
@@ -31,7 +31,8 @@ template(name="cardLabelsPopup")
         a.card-label-edit-button.fa.fa-pencil.js-edit-label
         span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
           class="{{# if isLabelSelected ../_id }}active{{/if}}")
-            = name
+            +viewer
+              = name
             if(isLabelSelected ../_id)
               i.card-label-selectable-icon.fa.fa-check
   if currentUser.isBoardAdmin
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index f47ae0c9..442d3c6c 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -58,7 +58,8 @@ template(name="minicard")
           .minicard-custom-field
             if definition.showLabelOnMiniCard
               .minicard-custom-field-item
-                = definition.name
+                +viewer
+                  = definition.name
             .minicard-custom-field-item
               +viewer
                 = trueValue
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index aa6d3786..d9644d00 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -10,7 +10,8 @@ template(name="listHeader")
           a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
       h2.list-header-name(
         class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
+        +viewer
+          = title
         if wipLimit.enabled
          | (
          span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 4e4d355c..8abd6a68 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -189,7 +189,9 @@ template(name="labelsWidget")
       each currentBoard.labels
           a.card-label(class="card-label-{{color}}"
             class="{{#if currentUser.isNotCommentOnly}}js-label{{/if}}")
-            span.card-label-name= name
+            span.card-label-name
+              +viewer
+                = name
       if currentUser.isBoardAdmin
         a.card-label.add-label.js-add-label
           i.fa.fa-plus
diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade
index f0a17773..4d023f45 100644
--- a/client/components/sidebar/sidebarCustomFields.jade
+++ b/client/components/sidebar/sidebarCustomFields.jade
@@ -6,7 +6,9 @@ template(name="customFieldsSidebar")
                     div.minicard
                         a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button
                         div.minicard-title
-                            | {{ name }} ({{ type }})
+                          +viewer
+                            =name
+                          | ({{ type }})
 
     if currentUser.isBoardMember
         hr
diff --git a/package.json b/package.json
index 6336465c..f789e977 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.69.0",
+  "version": "v2.70.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 56162c6e..ce1c32a3 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 = 271,
+    appVersion = 272,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.69.0~2019-05-11"),
+    appMarketingVersion = (defaultText = "2.70.0~2019-05-11"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,