Merge pull request #27 from ds-wizard/develop

Release 2.12.0
ds-wizard · Mar 13, 2021 · f8ad117 · f8ad117
2 parents 3103741 + c10f606
commit f8ad117
Show file tree

Hide file tree

Showing 5 changed files with 1,366 additions and 8 deletions.
diff --git a/docs/admin/upgrade.rst b/docs/admin/upgrade.rst
@@ -43,6 +43,10 @@ Upgrade process
 
 Usually, nothing special is required for upgrade. Internal structure changes are migrated automatically using DB migrations and Metamodel migrations *(since 1.8.0)*. See below the changes that needs to be done by you *(since 1.10.0)*:
 
+2.11.X to 2.12.X
+----------------
+
+- The metamodel for templates has been upgraded and accessing the reply values is changed due to additional metadata about each reply, see :ref:`schema-doc-context`. But if you are using filters such as ``reply_str``, it gets the reply object with value correctly. Moreover, for working with integration reply, the type values are renamed ``IntegrationValue`` -> ``IntegrationType`` and ``PlainValue`` -> ``PlainType`` for consistency.
 
 2.10.X to 2.11.X
 ----------------
@@ -155,9 +159,11 @@ The DS Wizard is compatible with all recent versions of web browsers Chrome, Ope
 +------------------+--------------+--------------------+-----------+
 | DS Wizard        | KM Metamodel | Template Metamodel | Registry  | 
 +==================+==============+====================+===========+
-| 2.8.0            |            5 |                  2 |     2.8.0 |
+| 2.12.0           |            5 |                  3 |    2.12.0 |
++------------------+--------------+--------------------+-----------+
+| 2.11.0           |            5 |                  2 |    2.11.0 |
 +------------------+--------------+--------------------+-----------+
-| 2.7.0            |            5 |                  2 |     2.7.0 |
+| ...              |            5 |                  2 |       ... |
 +------------------+--------------+--------------------+-----------+
 | 2.6.0            |            5 |                  2 |     2.6.0 |
 +------------------+--------------+--------------------+-----------+

diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'DSW Team'
 
 # The full version, including alpha/beta/rc tags
-release = '2.11.0'
+release = '2.12.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/dev/roadmap.rst b/docs/dev/roadmap.rst
@@ -9,16 +9,26 @@ Roadmap
 Planned
 =======
 
-2.12.0
+2.13.0
 ------
 
-- End of development: 23 February 2021
-- Release: 2 March 2021
-- `Jira issues 2.12.0 <https://ds-wizard.atlassian.net/browse/DSW-995?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%202.12.0%20ORDER%20BY%20priority%20DESC>`_
+- Release (expected): 6 April 2021
+- `Jira issues 2.13.0 <https://ds-wizard.atlassian.net/browse/DSW-1025?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%202.13.0%20ORDER%20BY%20priority%20DESC>`_
+
 
 Released
 ========
 
+2.12.0
+------
+
+- End of development: 2 March 2021
+- Release: 12 March 2021
+- `Jira issues 2.12.0 <https://ds-wizard.atlassian.net/browse/DSW-995?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%202.12.0%20ORDER%20BY%20priority%20DESC>`_
+- Key changes:
+
+   - Questionnaire versioning (Version History)
+
 2.11.0
 ------
 

diff --git a/docs/dev/schemas/doc_context.rst b/docs/dev/schemas/doc_context.rst
@@ -5,7 +5,7 @@ Document Context
 ****************
 
 
-The following documentation is generated from :download:`Document Context Schema <doc_context_schema_v2.json>` describing *Document Context* that is passed to document templates when generating a document using Jinja2.
+The following documentation is generated from :download:`Document Context Schema <doc_context_schema_v3.json>` describing *Document Context* that is passed to document templates when generating a document using Jinja2.
 
 .. jsonschema:: doc_context_schema_v2.json
    :lift_definitions: