Merge commit 'd9b978cb82109b71c05d03807a8558ba1dc537a4' into feature-tabletop

app/imports/client/ui/components/ColorPicker.vue

@@ -18,7 +18,7 @@
         {{ label }}
         <v-icon
           :right="!!label"
-          :color="value"
+          :color="noColorChange ? undefined : value"
         >
           mdi-format-paint
         </v-icon>
@@ -148,6 +148,7 @@
         type: Number,
         default: undefined,
       },
+      noColorChange: Boolean,
     },
     data(){ return {
       colors: [

app/imports/client/ui/components/MarkdownText.vue

@@ -9,6 +9,7 @@
 
 <script lang="js">
 import { marked } from 'marked';
+import DOMPurify from 'dompurify';
 
 export default {
   props: {
@@ -20,7 +21,7 @@ export default {
   computed: {
     compiledMarkdown() {
       if (!this.markdown) return;
-      return marked(this.markdown);
+      return DOMPurify.sanitize(marked(this.markdown));
     },
   },
 }

app/imports/client/ui/components/tree/TreeNode.vue

@@ -40,6 +40,7 @@
         <tree-node-view
           :model="node"
           :selected="selected"
+          :show-external-details="showExternalDetails"
         />
       </div>
     </div>
@@ -57,6 +58,7 @@
             :organize="organize"
             :selected-node="selectedNode"
             :start-expanded="startExpanded"
+            :show-external-details="showExternalDetails"
             @reordered="e => $emit('reordered', e)"
             @reorganized="e => $emit('reorganized', e)"
             @selected="e => $emit('selected', e)"
@@ -115,6 +117,7 @@ export default {
     },
     selected: Boolean,
     startExpanded: Boolean,
+    showExternalDetails: Boolean,
   },
   data() {
     return {
@@ -214,6 +217,6 @@ export default {
 
 .tree-node-title,
 .dummy-node {
-  height: 40px;
+  min-height: 40px;
 }
 </style>

app/imports/client/ui/components/tree/TreeNodeList.vue

@@ -23,6 +23,7 @@
       :organize="organize"
       :lazy="lazy"
       :start-expanded="startExpanded"
+      :show-external-details="showExternalDetails"
       @selected="e => $emit('selected', e)"
       @reordered="e => $emit('reordered', e)"
       @reorganized="e => $emit('reorganized', e)"
@@ -64,6 +65,7 @@ export default {
       default: () => [],
     },
     startExpanded: Boolean,
+    showExternalDetails: Boolean,
   },
   data() {
     return {