From 308d255a252fc779cd84d316e5f7b47c1f1008ec Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Dec 2019 11:11:31 -0500
Subject: [PATCH 1/5] update jquery to 2.2.4, closes #471

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 86eb284b3..6dbc2bbd1 100644
--- a/bower.json
+++ b/bower.json
@@ -18,7 +18,7 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.3",
+    "jquery": "2.2.4",
     "tweetnacl": "0.12.2",
     "components-font-awesome": "^4.6.3",
     "ckeditor": "4.7.3",

From e39257672c9dabd7a881d2dd949db4a71ce81820 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Dec 2019 11:27:13 -0500
Subject: [PATCH 2/5] enable gantt chart rendering in rendered markdown

---
 www/common/diffMarked.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 07044f5e2..2b2cf4a1c 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -84,7 +84,7 @@ define([
 
     var defaultCode = renderer.code;
     renderer.code = function (code, language) {
-        if (language === 'mermaid' && (code.match(/^sequenceDiagram/) || code.match(/^graph/))) {
+        if (language === 'mermaid' && (code.match(/^sequenceDiagram/) || code.match(/^(graph|gantt)/))) {
             return '<pre class="mermaid">'+code+'</pre>';
         } else {
             return defaultCode.apply(renderer, arguments);

From aa6beebe6a88d2e76a60fea31242414a04ed1553 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Dec 2019 11:56:29 -0500
Subject: [PATCH 3/5] address jquery version conflict

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 6dbc2bbd1..b67900338 100644
--- a/bower.json
+++ b/bower.json
@@ -51,6 +51,7 @@
     "requirejs-plugins": "^1.0.3"
   },
   "resolutions": {
-    "bootstrap": "^v4.0.0"
+    "bootstrap": "^v4.0.0",
+    "jquery": "2.2.4"
   }
 }

From e7447008cef7310a928c98596d4c96253ef18a13 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Dec 2019 13:08:33 -0500
Subject: [PATCH 4/5] enable more mermaid modes

---
 www/common/diffMarked.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 2b2cf4a1c..35bd82c55 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -84,7 +84,7 @@ define([
 
     var defaultCode = renderer.code;
     renderer.code = function (code, language) {
-        if (language === 'mermaid' && (code.match(/^sequenceDiagram/) || code.match(/^(graph|gantt)/))) {
+        if (language === 'mermaid' && code.match(/^(graph|pie|gantt|sequenceDiagram|classDiagram|gitGraph)/))) {
             return '<pre class="mermaid">'+code+'</pre>';
         } else {
             return defaultCode.apply(renderer, arguments);

From ff67f8381bba5bc0241e621b729692e5567ee626 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Dec 2019 13:10:38 -0500
Subject: [PATCH 5/5] oops, I really should have linted before pushing...

---
 www/common/diffMarked.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 35bd82c55..5817e5ac9 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -84,7 +84,7 @@ define([
 
     var defaultCode = renderer.code;
     renderer.code = function (code, language) {
-        if (language === 'mermaid' && code.match(/^(graph|pie|gantt|sequenceDiagram|classDiagram|gitGraph)/))) {
+        if (language === 'mermaid' && code.match(/^(graph|pie|gantt|sequenceDiagram|classDiagram|gitGraph)/)) {
             return '<pre class="mermaid">'+code+'</pre>';
         } else {
             return defaultCode.apply(renderer, arguments);