devilry 6.2.2__tar.gz → 6.2.4__tar.gz

{devilry-6.2.2 → devilry-6.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devilry
-Version: 6.2.2
+Version: 6.2.4
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
 Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth
 Author-email: Espen Angell Kristiansen <post@appresso.no>

devilry-6.2.4/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = '6.2.4'

{devilry-6.2.2 → devilry-6.2.4}/devilry/devilry_cradmin/templates/cradmin_legacy/standalone-base.django.html

@@ -1,8 +1,15 @@
 {% extends "cradmin_legacy/standalone-base-internal.django.html" %}
 {% load static %}
+{% load devilry_theme3_tags %}
 
 {% block html-element-lang %}{{ DEVILRY_LANGUAGE_CODE }}{% endblock %}
 
+{% block jsimports %}
+    <script type='module'>
+        import '{% devilry_theme3_dist_path %}/scripts/plain_es6/latex_math.js';
+    </script>
+{% endblock %}
+
 {% block styles %}
     {{ block.super }}
     {% include "devilry_theme3/favicons.django.html" %}

{devilry-6.2.2 → devilry-6.2.4}/devilry/devilry_markup/parse_markdown.py

@@ -1,6 +1,6 @@
 import markdown
 from markdown.extensions.codehilite import CodeHiliteExtension
-# from markdown.extensions.fenced_code import 
+# from markdown.extensions.fenced_code import
 from html_sanitizer.django import get_sanitizer
 
 from devilry.devilry_markup.markdown_extensions.code_diff import CodeDiffExtension
@@ -15,19 +15,22 @@ def markdown_full(inputMarkdown):
         safe_mode="escape",
         extensions=[
             CodeDiffExtension(),
-            LatexMathExtension(),
-            LatexMathInlineExtension(),
             CodeHiliteExtension(
                 guess_lang=False,
                 linenums=False
-            ), # Syntax hilite code
-            'fenced_code', # Support github style code blocks
-            'nl2br', # Support github style newline handling
-            'sane_lists', # Break into new ul/ol tag when the next line starts with another class of list indicator
-            'def_list', # Support definition lists
-            'tables', # Support tables
+            ),
+            LatexMathInlineExtension(),
+            LatexMathExtension(),
+            'fenced_code',  # Support github style code blocks
+            'sane_lists',  # Break into new ul/ol tag when the next line starts with another class of list indicator
+            'def_list',  # Support definition lists
+            'tables',  # Support tables
+            'nl2br',  # Support github style newline handling
         ])
+
+
     html = md.convert(inputMarkdown)
     html = sanitizer.sanitize(html)
+
     html = html.replace('{{', '{ {').replace('}}', '} }')
     return html

{devilry-6.2.2 → devilry-6.2.4}/devilry/devilry_markup/templates/devilry_markup/latex_math.html

@@ -1,7 +1,3 @@
 {% load devilry_theme3_tags %}
 
 <devilry-latex-math data-latex-code={{ latex_code_attr_safe }} data-variant="{{ variant }}"></devilry-latex-math>
-
-<script type='module'>
-    import '{% devilry_theme3_dist_path %}/scripts/plain_es6/latex_math.js';
-</script>

{devilry-6.2.2 → devilry-6.2.4}/devilry/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-04 13:56+0100\n"
+"POT-Creation-Date: 2024-02-14 15:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6989,19 +6989,19 @@ msgid ""
 "ends with a preview of the results before you get the option to save"
 msgstr ""
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:307
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:309
 msgid "Provide a message as to why the Status needs to be retracted."
 msgstr ""
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:313
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:315
 msgid "Message"
 msgstr ""
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:330
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:332
 msgid "Why is the status retracted?"
 msgstr ""
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:373
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:375
 msgid "Cannot retract status without a message."
 msgstr ""
 

{devilry-6.2.2 → devilry-6.2.4}/devilry/locale/nb/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Devilry\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-04 13:56+0100\n"
+"POT-Creation-Date: 2024-02-14 15:57+0100\n"
 "PO-Revision-Date: 2023-07-19 13:23+0200\n"
 "Last-Translator: Espen Angell Kristiansen <espen@appresso.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/devilry/"
@@ -7624,19 +7624,19 @@ msgstr ""
 "Velg et av alternativene fra listen. Hvert alternativ starter som slutter "
 "med en forhåndsvisning av resultatene, før du får muligheten til å lagre"
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:307
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:309
 msgid "Provide a message as to why the Status needs to be retracted."
 msgstr "Gi en beskjed om hvorfor Statusen må trekkes tilbake."
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:313
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:315
 msgid "Message"
 msgstr "Beskjed"
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:330
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:332
 msgid "Why is the status retracted?"
 msgstr "Hvorfor er denne statusen trukket tilbake?"
 
-#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:373
+#: devilry/devilry_qualifiesforexam/views/qualification_preview_view.py:375
 msgid "Cannot retract status without a message."
 msgstr "Kan ikke trekke tilbake en status uten en beskjed."
 

{devilry-6.2.2 → devilry-6.2.4}/devilry/project/common/settings.py

@@ -70,7 +70,7 @@ INSTALLED_APPS = [
     'devilry.devilry_markup',
     'devilry.devilry_superadmin',
     'devilry.devilry_authenticate',
-    
+
     'devilry.devilry_errortemplates',
     'devilry.devilry_help',
     'devilry.devilry_theme3',
@@ -222,13 +222,18 @@ HTML_SANITIZERS = {
     'devilry': {
         "tags": {
             "a", "h1", "h2", "h3", "strong", "em", "p", "ul", "ol",
-            "li", "br", "sub", "sup", "hr", "img", "code"
+            "li", "br", "sub", "sup", "hr", "img", "code", "pre", "div",
+            "span", "devilry-latex-math", "script"
         },
         "attributes": {
             "a": ("href", "name", "target", "title", "id", "rel",),
-            "img": ("src", "alt", "title")
+            "img": ("src", "alt", "title"),
+            "code": ("class",),
+            "div": ("class",),
+            "devilry-latex-math": ("data-latex-code", "data-variant"),
+            "span": ("class",),
         },
-        "empty": {"hr", "a", "br", "img"},
+        "empty": {"hr", "a", "br", "img", "span", "devilry-latex-math"},
         "separate": {"a", "p", "li"},
         "whitespace": {"br"},
         "keep_typographic_whitespace": True,
@@ -247,6 +252,6 @@ HTML_SANITIZERS = {
             target_blank_noopener,
         ],
         "element_postprocessors": [],
-        "is_mergeable": lambda e1, e2: True,
+        "is_mergeable": lambda e1, e2: False,
     }
-}
+}

{devilry-6.2.2 → devilry-6.2.4}/pyproject.toml

@@ -116,7 +116,7 @@ exclude = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "6.2.2"
+version = "6.2.4"
 version_files = ["devilry/__init__.py:__version__"]
 tag_format = "$version"
 update_changelog_on_bump = true

devilry-6.2.2/devilry/__init__.py

@@ -1 +0,0 @@
-__version__ = '6.2.2'