Merge pull request #136 from ds-wizard/release/4.4.0

Release/4.4.0
ds-wizard · Mar 5, 2024 · 8604d08 · 8604d08
2 parents f5b2e08 + 3cb0671
commit 8604d08
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 10 deletions.
diff --git a/docs/application/administration/locales/detail/detail.png b/docs/application/administration/locales/detail/detail.png
diff --git a/docs/application/administration/locales/import/registry.png b/docs/application/administration/locales/import/registry.png
diff --git a/docs/application/administration/locales/index/list.png b/docs/application/administration/locales/index/list.png
diff --git a/docs/application/administration/settings/system/privacy-and-support.rst b/docs/application/administration/settings/system/privacy-and-support.rst
@@ -6,4 +6,4 @@ To request users to agree with **Privacy Policy** and/or **Terms of Service** do
 Support
 =======
 
-These settings also allow us to configure **Support Email** that users can use to request help or report issues. Similarly **Support Repository Name** and **Support Repository URL** can be used in case we want users to create tickets in issue tracker of some repository, e.g., on GitHub. These support links are then shown in :guilabel:`Report issue` modal window.
+These settings also allow us to configure **Support Email** that users can use to request help or report issues. Similarly **Support Site Name** and **Support Site URL** can be used in case we want users to create tickets in issue tracker of some repository, e.g., on GitHub. These support links are then shown in :guilabel:`Report issue` modal window.
diff --git a/docs/application/administration/users/detail/profile.png b/docs/application/administration/users/detail/profile.png
diff --git a/docs/application/administration/users/index/list.png b/docs/application/administration/users/index/list.png
diff --git a/docs/application/document-templates/editors/detail/files/files.png b/docs/application/document-templates/editors/detail/files/files.png
diff --git a/docs/application/document-templates/editors/detail/index/editor.png b/docs/application/document-templates/editors/detail/index/editor.png
diff --git a/docs/application/document-templates/editors/index/list.png b/docs/application/document-templates/editors/index/list.png
diff --git a/docs/application/document-templates/list/detail/detail.png b/docs/application/document-templates/list/detail/detail.png
diff --git a/docs/application/document-templates/list/index/list.png b/docs/application/document-templates/list/index/list.png
diff --git a/docs/application/documents/index/list.png b/docs/application/documents/index/list.png
diff --git a/docs/application/knowledge-models/editors/detail/index/km-editor.png b/docs/application/knowledge-models/editors/detail/index/km-editor.png
diff --git a/docs/application/knowledge-models/editors/detail/preview/preview.png b/docs/application/knowledge-models/editors/detail/preview/preview.png
diff --git a/docs/application/knowledge-models/editors/index/knowledge-model-editors-list.png b/docs/application/knowledge-models/editors/index/knowledge-model-editors-list.png
diff --git a/docs/application/knowledge-models/editors/migration/migration.png b/docs/application/knowledge-models/editors/migration/migration.png
diff --git a/docs/application/knowledge-models/list/detail/detail.png b/docs/application/knowledge-models/list/detail/detail.png
diff --git a/docs/application/knowledge-models/list/import/registry.png b/docs/application/knowledge-models/list/import/registry.png
diff --git a/docs/application/knowledge-models/list/index/list.png b/docs/application/knowledge-models/list/index/list.png
diff --git a/docs/application/profile/edit/active-sessions/form.png b/docs/application/profile/edit/active-sessions/form.png
diff --git a/docs/application/profile/edit/index/form.png b/docs/application/profile/edit/index/form.png
diff --git a/docs/application/profile/index/menu.png b/docs/application/profile/index/menu.png
diff --git a/docs/application/projects/list/create/project-create-custom.png b/docs/application/projects/list/create/project-create-custom.png
diff --git a/docs/application/projects/list/create/project-create.png b/docs/application/projects/list/create/project-create.png
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 project_name_full = 'Data Stewardship Wizard'
 
 # The full version, including alpha/beta/rc tags
-version = release = '4.3'
+version = release = '4.4'
 
 rst_prolog = f"""
 

diff --git a/docs/more/development/document-templates/steps/pandoc.rst b/docs/more/development/document-templates/steps/pandoc.rst
@@ -23,25 +23,29 @@ Options
 -  ``from`` = specification of the input format (passed to Pandoc via ``--from``, see `docs <https://pandoc.org/MANUAL.html#general-options>`__)
 -  ``to`` = specification of the output format (passed to Pandoc via ``--to``, see `docs <https://pandoc.org/MANUAL.html#general-options>`__)
 -  (optional) ``args`` = additional command line arguments passed to `pandoc <https://pandoc.org/MANUAL.html>`__
+-  (optional, experimental) ``filters`` = additional `Pandoc filters <https://pandoc.org/MANUAL.html#general-options>`__ to be used, need to be located under ``/pandoc/filters`` directory (or other set by ``PANDOC_FILTERS`` environment variable), comma separated
+-  (optional, experimental) ``template`` = `Pandoc template <https://pandoc.org/MANUAL.html#general-options>`__ to be used, need to be located under ``/pandoc/templates`` directory (or other set by ``PANDOC_TEMPLATES`` environment variable)
 
 Notes
 =====
 
 -  Pandoc filter ``pandoc-docx-pagebreakpy`` can be found in `addons <../../addons>`__ directory.
+-  Pandoc filter ``pandoc-docx-pagebreakpy`` will be removed with the next template metamodel version, use `` for the ``filters`` option instead.
 
 Example
 =======
 
 .. code:: json
 
-   {
-     "name" : "pandoc",
-     "options" : {
-       "from" : "html",
-       "to" : "docx",
-       "args": "--filter=pandoc-docx-pagebreakpy --reference-doc=src/reference.docx"
-     }
-   }
+  {
+    "name" : "pandoc",
+    "options" : {
+      "from" : "html",
+      "to" : "docx",
+      "args": "--filter=pandoc-docx-pagebreakpy --reference-doc=src/reference.docx",
+      "filters": "docx-pagebreak.lua, docx-toc.lua"
+    }
+  }
 
 .. |badge-status| image:: https://img.shields.io/badge/status-stable-green
 .. |badge-metamodel| image:: https://img.shields.io/badge/metamodel%20version-%E2%89%A5%201-blue
diff --git a/docs/more/self-hosted-dsw/upgrade-guidelines.rst b/docs/more/self-hosted-dsw/upgrade-guidelines.rst
@@ -43,6 +43,11 @@ Usually, nothing special is required for the upgrade. Internal structure changes
 
    Make sure to stop ``document-worker`` and ``mailer`` before upgrading to the next version. Run ``wizard-server`` first, then run the workers. Otherwise the database migrations might not work correctly.
 
+4.3.X to 4.4.X
+----------------
+
+*(nothing)*
+
 4.2.X to 4.3.X
 ----------------
-Original file line number
+Diff line change
@@ Expand Up @@
     Support
     =======
-    These settings also allow us to configure **Support Email** that users can use to request help or report issues. Similarly **Support Repository Name** and **Support Repository URL** can be used in case we want users to create tickets in issue tracker of some repository, e.g., on GitHub. These support links are then shown in :guilabel:`Report issue` modal window.
+    These settings also allow us to configure **Support Email** that users can use to request help or report issues. Similarly **Support Site Name** and **Support Site URL** can be used in case we want users to create tickets in issue tracker of some repository, e.g., on GitHub. These support links are then shown in :guilabel:`Report issue` modal window.