From 018f4084445cd262f2a2c626e57b9e125f2348c3 Mon Sep 17 00:00:00 2001 From: rschwammborn <21199730+rschwammborn@users.noreply.github.com> Date: Thu, 15 Apr 2021 14:09:33 +0200 Subject: [PATCH 01/12] Fix breakLine Change breakline to breakLine --- en/functions/editing/digitizer.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/functions/editing/digitizer.rst b/en/functions/editing/digitizer.rst index 84338b27e..4df7ed4f3 100644 --- a/en/functions/editing/digitizer.rst +++ b/en/functions/editing/digitizer.rst @@ -10,7 +10,7 @@ In order to use the digitizer, one has to define a specific yaml-definition: .. toctree:: :maxdepth: 1 - digitizer/digitizer_configuration.rst + digitizer/digitizer_configuration.rst More information about the functionality of the digitizer can be found here: From e3fcecbabf13a47196021aaaab98cf906624ff5d Mon Sep 17 00:00:00 2001 From: Robin Schwammborn Date: Mon, 31 May 2021 09:26:56 +0200 Subject: [PATCH 02/12] Fix deprecated sitelink URL template --- de/customization/yaml.rst | 2 +- en/customization/yaml.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de/customization/yaml.rst b/de/customization/yaml.rst index 138758058..a29f42bce 100644 --- a/de/customization/yaml.rst +++ b/de/customization/yaml.rst @@ -111,7 +111,7 @@ Es kann ein Disclaimer mittels Sitelinks hinzugefügt werden. Dafür muss Folgen .. code-block:: yaml mapbender.sitelinks: - - link: https://mapbender.org/impressum-kontakt # Link URL + - link: https://mapbender.org/impressum # Link URL text: Impressum & Kontakt # Link Text - link: https://mapbender.org/datenschutz text: Datenschutz diff --git a/en/customization/yaml.rst b/en/customization/yaml.rst index 380193542..a262a98f6 100644 --- a/en/customization/yaml.rst +++ b/en/customization/yaml.rst @@ -116,10 +116,10 @@ A disclaimer can be added through the use of site links. .. code-block:: yaml mapbender.sitelinks: - - link: http://mapbender.org/en/about-contact # Link URL - text: Imprint & Contact # Link text - - link: http://mapbender.org/en/privacy-policy - text: Privacy-Policy + - link: https://mapbender.org/en/legal-notice/ # Link URL + text: Imprint & Contact # Link text + - link: https://mapbender.org/en/privacy-policy/ + text: Privacy Policy Site links will be seperated by "|". From b1adf2510490efedce5cb6bd2f777d5b1cff87d2 Mon Sep 17 00:00:00 2001 From: Astrid Emde Date: Thu, 10 Jun 2021 14:36:37 +0200 Subject: [PATCH 03/12] update update Mapbender --- de/installation/installation_update.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/de/installation/installation_update.rst b/de/installation/installation_update.rst index 8ea88f7cb..86b3175a2 100644 --- a/de/installation/installation_update.rst +++ b/de/installation/installation_update.rst @@ -25,15 +25,15 @@ Im Folgenden sind die einzelnen Schritte als Befehle aufgeführt. .. code-block:: bash # Laden Sie die neue Version herunter - wget -O http://mapbender.org/builds/mapbender3-3.0.4.0.tar.gz /tmp/build_mapbender/ - tar xfz /tmp/build_mapbender/mapbender3-3.0.4.0.tar.gz + wget -O http://mapbender.org/builds/mapbender-starter-current.tar.gz /tmp/build_mapbender/ + tar xfz /tmp/build_mapbender/mapbender-starter-current.tar.gz # Sichern Sie die alte Version mv /var/www/mapbender /var/www/mapbender_save # Aktivieren Sie den Code der neuen Version - cp -R /tmp/build_mapbender/mapbender3-3.0.4.0 /var/www/ - mv /var/www/mapbender3-3.0.4.0 /var/www/mapbender + cp -R /tmp/build_mapbender/mapbender-starter-v3.2.5 /var/www/ + mv /var/www/mapbender-starter-v3.2.5 /var/www/mapbender # Übernehmen Sie die Konfigurationsdateien in die neue Version von Mapbender cp /var/www/mapbender_save/app/config/parameters.yml /var/www/mapbender/app/config/parameters.yml From 8eb8e6716412e8fe4f95e5a3303c652464415232 Mon Sep 17 00:00:00 2001 From: Astrid Emde Date: Thu, 10 Jun 2021 14:40:55 +0200 Subject: [PATCH 04/12] Update update.rst --- en/installation/installation_update.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/installation/installation_update.rst b/en/installation/installation_update.rst index a562cc5db..23e55e2b6 100644 --- a/en/installation/installation_update.rst +++ b/en/installation/installation_update.rst @@ -25,8 +25,8 @@ Have a look at the steps as commands .. code-block:: bash # Download the new version - wget -O http://mapbender.org/builds/mapbender3-3.0.4.0.tar.gz /tmp/build_mapbender/ - tar xfz /tmp/build_mapbender/mapbender3-3.0.4.0.tar.gz + wget -O http://mapbender.org/builds/mapbender-starter-current.tar.gz /tmp/build_mapbender/ + tar xfz /tmp/build_mapbender/mapbender-starter-current.tar.gz # save the old version mv /var/www/mapbender /var/www/mapbender_save From 32bbab8c1fb49a365645f91eecc8f306ee646cb8 Mon Sep 17 00:00:00 2001 From: Astrid Emde Date: Thu, 10 Jun 2021 14:44:12 +0200 Subject: [PATCH 05/12] updated update installaton for en --- en/installation/installation_update.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/en/installation/installation_update.rst b/en/installation/installation_update.rst index 23e55e2b6..2c00260b1 100644 --- a/en/installation/installation_update.rst +++ b/en/installation/installation_update.rst @@ -32,8 +32,8 @@ Have a look at the steps as commands mv /var/www/mapbender /var/www/mapbender_save # get the code of the new version - cp -R /tmp/build_mapbender/mapbender-3.0.4.0 /var/www/ - mv /var/www/mapbender-3.0.4.0 /var/www/mapbender + cp -R /tmp/build_mapbender/mapbender-starter-v3.2.5 /var/www/ + mv /var/www/mapbender-starter-v3.2.5 /var/www/mapbender # copy your old configuration files to the new version cp /var/www/mapbender_save/app/config/parameters.yml /var/www/mapbender/app/config/parameters.yml @@ -53,6 +53,8 @@ Have a look at the steps as commands cd /var/www/mapbender/ app/console doctrine:schema:update --dump-sql app/console doctrine:schema:update --force + + # Update the symbolic links app/console assets:install web --symlink --relative # change the access rights and owner of the files From 1af7b89534e3f5b448af550be2c570fcc3d45e85 Mon Sep 17 00:00:00 2001 From: Astrid Emde Date: Tue, 22 Jun 2021 15:54:55 +0200 Subject: [PATCH 06/12] fixed suggestions robin --- de/installation/installation_update.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/de/installation/installation_update.rst b/de/installation/installation_update.rst index 86b3175a2..720fc2c6b 100644 --- a/de/installation/installation_update.rst +++ b/de/installation/installation_update.rst @@ -25,7 +25,7 @@ Im Folgenden sind die einzelnen Schritte als Befehle aufgeführt. .. code-block:: bash # Laden Sie die neue Version herunter - wget -O http://mapbender.org/builds/mapbender-starter-current.tar.gz /tmp/build_mapbender/ + wget -O http://mapbender.org/builds/mapbender-starter-current.tar.gz /tmp/build_mapbender/ tar xfz /tmp/build_mapbender/mapbender-starter-current.tar.gz # Sichern Sie die alte Version @@ -54,9 +54,13 @@ Im Folgenden sind die einzelnen Schritte als Befehle aufgeführt. app/console doctrine:schema:update --dump-sql app/console doctrine:schema:update --force +<<<<<<< HEAD:de/installation/installation_update.rst # Importieren Sie die Anwendungen aus der mapbender.yml Datei, um sich den neusten Stand der Entwicklungen anzuschauen bin/composer run reimport-example-apps +======= + # Aufbau der symbolischen Links +>>>>>>> 3f5d6a7 (fixed suggestions robin):de/installation/update.rst app/console assets:install web --symlink --relative # Setzen Sie die Schreibrechte für Besitzer (u), Gruppe (g) und Andere (a). Weisen Sie die Skripte dem Apache User (www-data) zu. From 092fdcc3e8e287c72d6f71456d4eaeeb58441491 Mon Sep 17 00:00:00 2001 From: Robin Schwammborn Date: Wed, 26 Jan 2022 11:41:36 +0100 Subject: [PATCH 07/12] Versions Update --- de/versions.rst | 42 ++++++++++++++++++++++++++++++++++++++++-- en/versions.rst | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/de/versions.rst b/de/versions.rst index e41083d73..929bf31cb 100644 --- a/de/versions.rst +++ b/de/versions.rst @@ -3,13 +3,51 @@ Versionshistorie ================ -`English Version of this document. <../en/versions.html>`_ +`English version of this document. <../en/versions.html>`_ Die Übersicht der Meilensteine finden Sie auf `Github `_. -.. _versions: +Version 3.2.8 +------------- + +Release Datum: 02.11.2021 + +**Verbesserungen und Bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v328 + + +Version 3.2.7 +------------- + +Release Datum: 07.09.2021 + +**Verbesserungen und Bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v327 + + +Version 3.2.6 +------------- + +Release Datum: 09.08.2021 + +**Verbesserungen und Bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v326 + + +Version 3.2.5 +------------- + +Release Datum: 08.06.2021 + +**Verbesserungen und Bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v325 + Version 3.2.4 ------------- diff --git a/en/versions.rst b/en/versions.rst index 07de44902..922a64af1 100644 --- a/en/versions.rst +++ b/en/versions.rst @@ -3,9 +3,50 @@ Version history =============== -`German Version of this document. <../de/versions.html>`_ +`German version of this document. <../de/versions.html>`_ -You find the milestones at: https://github.com/mapbender/mapbender/milestones +You can find the milestones at `Github `_. + + + +Version 3.2.8 +------------- + +Release date: 02.11.2021 + +**Improvements and bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v328 + + +Version 3.2.7 +------------- + +Release date: 07.09.2021 + +**Improvements and bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v327 + + +Version 3.2.6 +------------- + +Release date: 09.08.2021 + +**Improvements and bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v326 + + +Version 3.2.5 +------------- + +Release date: 08.06.2021 + +**Improvements and bugfixes:** + +* https://github.com/mapbender/mapbender-starter/blob/master/CHANGELOG.md#v325 Version 3.2.4 From 4fdf42574b358f5195e96885572775f8482ccf88 Mon Sep 17 00:00:00 2001 From: rschwammborn <21199730+rschwammborn@users.noreply.github.com> Date: Wed, 2 Feb 2022 09:50:31 +0100 Subject: [PATCH 08/12] Fix merge conflict mistake (de) installation_update.rst still had the merge conflict brackets, this commit removes them and adjusts the file back to the newest version --- de/installation/installation_update.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/de/installation/installation_update.rst b/de/installation/installation_update.rst index 720fc2c6b..c5b608d3b 100644 --- a/de/installation/installation_update.rst +++ b/de/installation/installation_update.rst @@ -54,13 +54,9 @@ Im Folgenden sind die einzelnen Schritte als Befehle aufgeführt. app/console doctrine:schema:update --dump-sql app/console doctrine:schema:update --force -<<<<<<< HEAD:de/installation/installation_update.rst # Importieren Sie die Anwendungen aus der mapbender.yml Datei, um sich den neusten Stand der Entwicklungen anzuschauen bin/composer run reimport-example-apps -======= - # Aufbau der symbolischen Links ->>>>>>> 3f5d6a7 (fixed suggestions robin):de/installation/update.rst app/console assets:install web --symlink --relative # Setzen Sie die Schreibrechte für Besitzer (u), Gruppe (g) und Andere (a). Weisen Sie die Skripte dem Apache User (www-data) zu. From d7b95075b57f41ce9d659cecb899e478f7d65361 Mon Sep 17 00:00:00 2001 From: rschwammborn <21199730+rschwammborn@users.noreply.github.com> Date: Wed, 2 Feb 2022 09:51:29 +0100 Subject: [PATCH 09/12] Update digitizer.rst Remove unnecessary spaces --- en/functions/editing/digitizer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/functions/editing/digitizer.rst b/en/functions/editing/digitizer.rst index 4df7ed4f3..d3c1f754e 100644 --- a/en/functions/editing/digitizer.rst +++ b/en/functions/editing/digitizer.rst @@ -10,7 +10,7 @@ In order to use the digitizer, one has to define a specific yaml-definition: .. toctree:: :maxdepth: 1 - digitizer/digitizer_configuration.rst + digitizer/digitizer_configuration.rst More information about the functionality of the digitizer can be found here: @@ -18,4 +18,4 @@ More information about the functionality of the digitizer can be found here: .. toctree:: :maxdepth: 1 - digitizer/digitizer_functionality.rst \ No newline at end of file + digitizer/digitizer_functionality.rst From c91808e7585ca7902864af627cda818e881cb2ac Mon Sep 17 00:00:00 2001 From: rschwammborn <21199730+rschwammborn@users.noreply.github.com> Date: Wed, 2 Feb 2022 09:52:34 +0100 Subject: [PATCH 10/12] Update installation_update.rst Remove unnecessary space --- de/installation/installation_update.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/installation/installation_update.rst b/de/installation/installation_update.rst index c5b608d3b..f9cac4472 100644 --- a/de/installation/installation_update.rst +++ b/de/installation/installation_update.rst @@ -26,7 +26,7 @@ Im Folgenden sind die einzelnen Schritte als Befehle aufgeführt. # Laden Sie die neue Version herunter wget -O http://mapbender.org/builds/mapbender-starter-current.tar.gz /tmp/build_mapbender/ - tar xfz /tmp/build_mapbender/mapbender-starter-current.tar.gz + tar xfz /tmp/build_mapbender/mapbender-starter-current.tar.gz # Sichern Sie die alte Version mv /var/www/mapbender /var/www/mapbender_save From 79f8f461e1d18f48d06f2d7554399b278551b3d3 Mon Sep 17 00:00:00 2001 From: rschwammborn <21199730+rschwammborn@users.noreply.github.com> Date: Wed, 2 Feb 2022 09:56:02 +0100 Subject: [PATCH 11/12] Include Mapbender Release 3.2.9 for versions (de) --- de/versions.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/de/versions.rst b/de/versions.rst index 929bf31cb..f0b68ce81 100644 --- a/de/versions.rst +++ b/de/versions.rst @@ -9,6 +9,16 @@ Die Übersicht der Meilensteine finden Sie auf `Github Date: Wed, 2 Feb 2022 09:59:51 +0100 Subject: [PATCH 12/12] Include Mapbender Version 3.2.9 for english versions.rst --- en/versions.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/en/versions.rst b/en/versions.rst index 922a64af1..a79c2d27f 100644 --- a/en/versions.rst +++ b/en/versions.rst @@ -9,6 +9,16 @@ You can find the milestones at `Github