Compare commits
No commits in common. "853a58b78b687dd9549e0a12e3eb630a0baa053d" and "410f96ffb4eb370cbaec3beef8c077539ff212ff" have entirely different histories.
853a58b78b
...
410f96ffb4
@ -32,7 +32,7 @@ class Config(object):
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
MARKDOWN_EXTENSIONS = ['extra', 'sane_lists', 'smarty', 'tables']
|
MARKDOWN_EXTENSIONS = ['extra', 'mdx_linkify', 'sane_lists', 'smarty', 'tables']
|
||||||
MARKDOWN_EXTENSION_CONFIGS = {
|
MARKDOWN_EXTENSION_CONFIGS = {
|
||||||
'extra': {
|
'extra': {
|
||||||
'attr_list': {},
|
'attr_list': {},
|
||||||
|
@ -7,6 +7,7 @@ import re
|
|||||||
from flask import Blueprint, Markup, abort
|
from flask import Blueprint, Markup, abort
|
||||||
from flask import current_app as app
|
from flask import current_app as app
|
||||||
from flask import redirect, request, send_from_directory
|
from flask import redirect, request, send_from_directory
|
||||||
|
from tzlocal import get_localzone
|
||||||
|
|
||||||
from incorporealcms.lib import get_meta_str, init_md, render
|
from incorporealcms.lib import get_meta_str, init_md, render
|
||||||
|
|
||||||
@ -50,7 +51,7 @@ def handle_markdown_file_path(resolved_path):
|
|||||||
try:
|
try:
|
||||||
logger.debug("opening resolved path '%s'", resolved_path)
|
logger.debug("opening resolved path '%s'", resolved_path)
|
||||||
with app.open_instance_resource(resolved_path, 'r') as entry_file:
|
with app.open_instance_resource(resolved_path, 'r') as entry_file:
|
||||||
mtime = datetime.datetime.fromtimestamp(os.path.getmtime(entry_file.name), tz=datetime.timezone.utc)
|
mtime = datetime.datetime.fromtimestamp(os.path.getmtime(entry_file.name), get_localzone())
|
||||||
entry = entry_file.read()
|
entry = entry_file.read()
|
||||||
logger.debug("resolved path '%s' read", resolved_path)
|
logger.debug("resolved path '%s' read", resolved_path)
|
||||||
except OSError:
|
except OSError:
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
/* specify almost no styling, just fix some image and nav rendering */
|
/* specify almost no styling, just fix some image rendering */
|
||||||
div.header {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.img-25 {
|
.img-25 {
|
||||||
max-width: 25% !important;
|
max-width: 25% !important;
|
||||||
}
|
}
|
||||||
@ -15,19 +10,3 @@ div.header {
|
|||||||
.img-75 {
|
.img-75 {
|
||||||
max-width: 75% !important;
|
max-width: 75% !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.img-center {
|
|
||||||
display: block;
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.img-left {
|
|
||||||
float: left;
|
|
||||||
margin-right: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.img-right {
|
|
||||||
float: right;
|
|
||||||
margin-left: 1em;
|
|
||||||
}
|
|
||||||
|
@ -8,16 +8,18 @@ attrs==21.4.0
|
|||||||
# via pytest
|
# via pytest
|
||||||
bandit==1.6.2
|
bandit==1.6.2
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
|
bleach==4.1.0
|
||||||
|
# via mdx-linkify
|
||||||
certifi==2021.10.8
|
certifi==2021.10.8
|
||||||
# via requests
|
# via requests
|
||||||
charset-normalizer==2.0.12
|
charset-normalizer==2.0.10
|
||||||
# via requests
|
# via requests
|
||||||
click==8.0.4
|
click==8.0.3
|
||||||
# via
|
# via
|
||||||
# flask
|
# flask
|
||||||
# pip-tools
|
# pip-tools
|
||||||
# safety
|
# safety
|
||||||
coverage[toml]==6.3.2
|
coverage[toml]==6.2
|
||||||
# via pytest-cov
|
# via pytest-cov
|
||||||
distlib==0.3.4
|
distlib==0.3.4
|
||||||
# via virtualenv
|
# via virtualenv
|
||||||
@ -25,7 +27,7 @@ dlint==0.12.0
|
|||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
dparse==0.5.1
|
dparse==0.5.1
|
||||||
# via safety
|
# via safety
|
||||||
filelock==3.6.0
|
filelock==3.4.2
|
||||||
# via
|
# via
|
||||||
# tox
|
# tox
|
||||||
# virtualenv
|
# virtualenv
|
||||||
@ -38,7 +40,7 @@ flake8==4.0.1
|
|||||||
# flake8-executable
|
# flake8-executable
|
||||||
# flake8-isort
|
# flake8-isort
|
||||||
# flake8-mutable
|
# flake8-mutable
|
||||||
flake8-blind-except==0.2.1
|
flake8-blind-except==0.2.0
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
flake8-builtins==1.5.3
|
flake8-builtins==1.5.3
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
@ -54,11 +56,11 @@ flake8-logging-format==0.6.0
|
|||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
flake8-mutable==1.2.0
|
flake8-mutable==1.2.0
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
flask==2.0.3
|
flask==2.0.2
|
||||||
# via -r requirements/requirements.in
|
# via -r requirements/requirements.in
|
||||||
gitdb==4.0.9
|
gitdb==4.0.9
|
||||||
# via gitpython
|
# via gitpython
|
||||||
gitpython==3.1.27
|
gitpython==3.1.26
|
||||||
# via bandit
|
# via bandit
|
||||||
idna==3.3
|
idna==3.3
|
||||||
# via requests
|
# via requests
|
||||||
@ -66,29 +68,34 @@ iniconfig==1.1.1
|
|||||||
# via pytest
|
# via pytest
|
||||||
isort==5.10.1
|
isort==5.10.1
|
||||||
# via flake8-isort
|
# via flake8-isort
|
||||||
itsdangerous==2.1.2
|
itsdangerous==2.0.1
|
||||||
# via flask
|
# via flask
|
||||||
jinja2==3.1.0
|
jinja2==3.0.3
|
||||||
# via flask
|
# via flask
|
||||||
markdown==3.3.6
|
markdown==3.3.6
|
||||||
# via -r requirements/requirements.in
|
# via
|
||||||
markupsafe==2.1.1
|
# -r requirements/requirements.in
|
||||||
|
# mdx-linkify
|
||||||
|
markupsafe==2.0.1
|
||||||
# via jinja2
|
# via jinja2
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
# via flake8
|
# via flake8
|
||||||
|
mdx-linkify==2.1
|
||||||
|
# via -r requirements/requirements.in
|
||||||
packaging==21.3
|
packaging==21.3
|
||||||
# via
|
# via
|
||||||
|
# bleach
|
||||||
# dparse
|
# dparse
|
||||||
# pytest
|
# pytest
|
||||||
# safety
|
# safety
|
||||||
# tox
|
# tox
|
||||||
pbr==5.8.1
|
pbr==5.8.0
|
||||||
# via stevedore
|
# via stevedore
|
||||||
pep517==0.12.0
|
pep517==0.12.0
|
||||||
# via pip-tools
|
# via pip-tools
|
||||||
pip-tools==6.5.1
|
pip-tools==6.4.0
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
platformdirs==2.5.1
|
platformdirs==2.4.1
|
||||||
# via virtualenv
|
# via virtualenv
|
||||||
pluggy==1.0.0
|
pluggy==1.0.0
|
||||||
# via
|
# via
|
||||||
@ -106,16 +113,18 @@ pydot==1.4.2
|
|||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
pyflakes==2.4.0
|
pyflakes==2.4.0
|
||||||
# via flake8
|
# via flake8
|
||||||
pyparsing==3.0.7
|
pyparsing==3.0.6
|
||||||
# via
|
# via
|
||||||
# packaging
|
# packaging
|
||||||
# pydot
|
# pydot
|
||||||
pytest==7.1.1
|
pytest==6.2.5
|
||||||
# via
|
# via
|
||||||
# -r requirements/requirements-dev.in
|
# -r requirements/requirements-dev.in
|
||||||
# pytest-cov
|
# pytest-cov
|
||||||
pytest-cov==3.0.0
|
pytest-cov==3.0.0
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
|
pytz-deprecation-shim==0.1.0.post0
|
||||||
|
# via tzlocal
|
||||||
pyyaml==6.0
|
pyyaml==6.0
|
||||||
# via
|
# via
|
||||||
# bandit
|
# bandit
|
||||||
@ -127,6 +136,7 @@ safety==1.10.3
|
|||||||
six==1.16.0
|
six==1.16.0
|
||||||
# via
|
# via
|
||||||
# bandit
|
# bandit
|
||||||
|
# bleach
|
||||||
# tox
|
# tox
|
||||||
# virtualenv
|
# virtualenv
|
||||||
smmap==5.0.0
|
smmap==5.0.0
|
||||||
@ -135,30 +145,36 @@ snowballstemmer==2.2.0
|
|||||||
# via pydocstyle
|
# via pydocstyle
|
||||||
stevedore==3.5.0
|
stevedore==3.5.0
|
||||||
# via bandit
|
# via bandit
|
||||||
testfixtures==6.18.5
|
testfixtures==6.18.3
|
||||||
# via flake8-isort
|
# via flake8-isort
|
||||||
toml==0.10.2
|
toml==0.10.2
|
||||||
# via
|
# via
|
||||||
# dparse
|
# dparse
|
||||||
|
# pytest
|
||||||
# tox
|
# tox
|
||||||
tomli==2.0.1
|
tomli==2.0.0
|
||||||
# via
|
# via
|
||||||
# coverage
|
# coverage
|
||||||
# pep517
|
# pep517
|
||||||
# pytest
|
|
||||||
tox==3.24.5
|
tox==3.24.5
|
||||||
# via
|
# via
|
||||||
# -r requirements/requirements-dev.in
|
# -r requirements/requirements-dev.in
|
||||||
# tox-wheel
|
# tox-wheel
|
||||||
tox-wheel==0.7.0
|
tox-wheel==0.7.0
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
urllib3==1.26.9
|
tzdata==2021.5
|
||||||
|
# via pytz-deprecation-shim
|
||||||
|
tzlocal==4.1
|
||||||
|
# via -r requirements/requirements.in
|
||||||
|
urllib3==1.26.8
|
||||||
# via requests
|
# via requests
|
||||||
versioneer==0.22
|
versioneer==0.21
|
||||||
# via -r requirements/requirements-dev.in
|
# via -r requirements/requirements-dev.in
|
||||||
virtualenv==20.13.4
|
virtualenv==20.13.0
|
||||||
# via tox
|
# via tox
|
||||||
werkzeug==2.0.3
|
webencodings==0.5.1
|
||||||
|
# via bleach
|
||||||
|
werkzeug==2.0.2
|
||||||
# via flask
|
# via flask
|
||||||
wheel==0.37.1
|
wheel==0.37.1
|
||||||
# via
|
# via
|
||||||
|
@ -1,2 +1,4 @@
|
|||||||
Flask # general purpose web service and web server stuff
|
Flask # general purpose web service and web server stuff
|
||||||
Markdown # markdown rendering in templates
|
Markdown # markdown rendering in templates
|
||||||
|
mdx-linkify # convert URLs in the text to clickable links
|
||||||
|
tzlocal # identifying system's local timezone
|
||||||
|
@ -4,17 +4,37 @@
|
|||||||
#
|
#
|
||||||
# pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
|
# pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
|
||||||
#
|
#
|
||||||
click==8.0.4
|
bleach==4.1.0
|
||||||
|
# via mdx-linkify
|
||||||
|
click==8.0.3
|
||||||
# via flask
|
# via flask
|
||||||
flask==2.0.3
|
flask==2.0.2
|
||||||
# via -r requirements/requirements.in
|
# via -r requirements/requirements.in
|
||||||
itsdangerous==2.1.2
|
itsdangerous==2.0.1
|
||||||
# via flask
|
# via flask
|
||||||
jinja2==3.1.0
|
jinja2==3.0.3
|
||||||
# via flask
|
# via flask
|
||||||
markdown==3.3.6
|
markdown==3.3.6
|
||||||
# via -r requirements/requirements.in
|
# via
|
||||||
markupsafe==2.1.1
|
# -r requirements/requirements.in
|
||||||
|
# mdx-linkify
|
||||||
|
markupsafe==2.0.1
|
||||||
# via jinja2
|
# via jinja2
|
||||||
werkzeug==2.0.3
|
mdx-linkify==2.1
|
||||||
|
# via -r requirements/requirements.in
|
||||||
|
packaging==21.3
|
||||||
|
# via bleach
|
||||||
|
pyparsing==3.0.6
|
||||||
|
# via packaging
|
||||||
|
pytz-deprecation-shim==0.1.0.post0
|
||||||
|
# via tzlocal
|
||||||
|
six==1.16.0
|
||||||
|
# via bleach
|
||||||
|
tzdata==2021.5
|
||||||
|
# via pytz-deprecation-shim
|
||||||
|
tzlocal==4.1
|
||||||
|
# via -r requirements/requirements.in
|
||||||
|
webencodings==0.5.1
|
||||||
|
# via bleach
|
||||||
|
werkzeug==2.0.2
|
||||||
# via flask
|
# via flask
|
||||||
|
Loading…
x
Reference in New Issue
Block a user