diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d59b6..923bc66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
## CHANGELOG
+### [24.9.0] - Sep 2, 2024
+- Removed 'Fira Code' font from `/logs` as it adds no value over 'Consolas'
+- Updated `codemirror` JavaScript library to 5.65.17
+- Updated `dayjs` JavaScript library to 1.11.13
+- Updated Pandoc to 3.3 in Dockerfile
+
### [24.6.4] - Jun 26, 2024
- The selected DataSet is now saved when you save the DataTemplate
- Updated Pandoc to 3.2.1 in Dockerfile
@@ -323,6 +329,7 @@
### 21.11.0 - Nov 29, 2021
- Initial release
+[24.9.0]: https://github.com/cmason3/jinjafx_server/compare/24.6.4...24.9.0
[24.6.4]: https://github.com/cmason3/jinjafx_server/compare/24.6.3...24.6.4
[24.6.3]: https://github.com/cmason3/jinjafx_server/compare/24.6.2...24.6.3
[24.6.2]: https://github.com/cmason3/jinjafx_server/compare/24.6.1...24.6.2
diff --git a/contrib/update_cdnjs_links.py b/contrib/update_cdnjs_links.py
index 5b9264a..c76ddcb 100755
--- a/contrib/update_cdnjs_links.py
+++ b/contrib/update_cdnjs_links.py
@@ -4,11 +4,10 @@
libraries = {
'bootstrap': '5.3.3',
- 'codemirror': '5.65.16',
- 'firacode': '6.2.0',
+ 'codemirror': '5.65.17',
'split.js': '1.6.5',
'js-yaml': '4.1.0',
- 'dayjs': '1.11.11',
+ 'dayjs': '1.11.13',
'pako': '2.1.0',
'jszip': '3.10.1',
'github-markdown-css': '5.6.1'
diff --git a/jinjafx_server.py b/jinjafx_server.py
index ed57601..fe300e4 100755
--- a/jinjafx_server.py
+++ b/jinjafx_server.py
@@ -28,7 +28,7 @@
import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess
import cmarkgfm, emoji
-__version__ = '24.6.4'
+__version__ = '24.9.0'
llock = threading.RLock()
rlock = threading.RLock()
@@ -392,7 +392,7 @@ def do_GET(self, head=False, cache=True, versioned=False):
headers = {
'X-Content-Type-Options': 'nosniff',
- 'Content-Security-Policy': "default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'; script-src 'self' https://cdnjs.cloudflare.com; font-src 'self' https://cdnjs.cloudflare.com; img-src data: *; frame-ancestors 'none'",
+ 'Content-Security-Policy': "default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'; script-src 'self' https://cdnjs.cloudflare.com; img-src data: *; frame-ancestors 'none'",
'Referrer-Policy': 'strict-origin-when-cross-origin'
}
etag = '"' + hashlib.sha224(repr(headers).encode('utf-8') + b'|' + r[0].encode('utf-8') + b'; ' + r[2]).hexdigest() + '"'
diff --git a/kubernetes/Dockerfile b/kubernetes/Dockerfile
index b84e765..4b2292d 100644
--- a/kubernetes/Dockerfile
+++ b/kubernetes/Dockerfile
@@ -7,8 +7,8 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends wget git build-essential; \
-wget -P /tmp https://github.com/jgm/pandoc/releases/download/3.2.1/pandoc-3.2.1-1-amd64.deb; \
-dpkg -i /tmp/pandoc-3.2.1-1-amd64.deb; \
+wget -P /tmp https://github.com/jgm/pandoc/releases/download/3.3/pandoc-3.3-1-amd64.deb; \
+dpkg -i /tmp/pandoc-3.3-1-amd64.deb; \
python3 -m venv /opt/jinjafx; \
/opt/jinjafx/bin/python3 -m pip install --upgrade git+https://github.com/cmason3/jinjafx_server.git@${BRANCH} lxml; \
diff --git a/www/index.html b/www/index.html
index 9937dd4..5e71fe2 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,31 +8,31 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/www/jinjafx_m.js b/www/jinjafx_m.js
index f447c57..9cba6fc 100644
--- a/www/jinjafx_m.js
+++ b/www/jinjafx_m.js
@@ -205,12 +205,6 @@ function getStatusText(code) {
function delete_dataset(ds) {
delete datasets[ds];
- //window.addEventListener('beforeunload', onBeforeUnload);
- //if (document.getElementById('get_link').value != 'false') {
- // document.title = 'JinjaFx [unsaved]';
- //}
- //dirty = true;
-
rebuild_datasets();
switch_dataset(Object.keys(datasets)[0], false, true);
fe.focus();
@@ -1406,11 +1400,6 @@ function getStatusText(code) {
if (!datasets.hasOwnProperty(new_ds)) {
datasets[new_ds] = [CodeMirror.Doc('', 'data'), CodeMirror.Doc('', 'yaml')];
rebuild_datasets();
- //window.addEventListener('beforeunload', onBeforeUnload);
- //if (document.getElementById('get_link').value != 'false') {
- // document.title = 'JinjaFx [unsaved]';
- //}
- //dirty = true;
}
switch_dataset(new_ds, true, true);
}
diff --git a/www/logs.css b/www/logs.css
index 2547c55..bce6538 100644
--- a/www/logs.css
+++ b/www/logs.css
@@ -4,7 +4,7 @@ body {
}
pre {
height: 100%;
- font-family: 'Fira Code', monospace;
+ font-family: Consolas, monaco, monospace;
font-size: 14px;
font-variant-ligatures: none;
white-space: pre-wrap;
diff --git a/www/logs.html b/www/logs.html
index bdcdf14..375c023 100644
--- a/www/logs.html
+++ b/www/logs.html
@@ -6,9 +6,8 @@
JinjaFx Logs
-
-
+
diff --git a/www/output.html b/www/output.html
index ee80e58..75e03f4 100644
--- a/www/output.html
+++ b/www/output.html
@@ -10,8 +10,8 @@
-
-
+
+