From a8d4a270072d87657446df260dfaa2029f91e414 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 9 Dec 2021 13:23:46 +0100
Subject: [PATCH 1/6] Change master->main in doc

---
 docs/datasheet.rst  | 2 +-
 docs/geobrowser.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/datasheet.rst b/docs/datasheet.rst
index 388181c..6f837a4 100644
--- a/docs/datasheet.rst
+++ b/docs/datasheet.rst
@@ -275,7 +275,7 @@ The current version of the DARIAH-DE Datasheet Editor is always accessible at ht
 GIT Repository
 --------------
 
-    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/tree/master/edit
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/tree/main
 
 
 Bug Tracking
diff --git a/docs/geobrowser.rst b/docs/geobrowser.rst
index 4f7b84f..6b84c19 100644
--- a/docs/geobrowser.rst
+++ b/docs/geobrowser.rst
@@ -244,7 +244,7 @@ GIT Repository
 --------------
 
 DARIAH-DE Geo-Browser Repository
-    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/tree/master
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/tree/main
 
 GeoTemCo
     * https://github.com/stjaenicke/GeoTemCo
-- 
GitLab


From d3faf074277439d3f1da29c3342a6bba2a3de51a Mon Sep 17 00:00:00 2001
From: Stefan Funk <funk@sub.uni-goettingen.de>
Date: Thu, 9 Dec 2021 16:12:11 +0000
Subject: [PATCH 2/6] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 073c975..f9b7485 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,14 +175,14 @@ deploy_dev:
     build_number: $PIPELINE_ID
     full_version: '${VERSION}-BETA-${build_number}'
     DEB_NAME: 'dariahde-geobrowser-beta_${full_version}.deb'
-    DEPLOY_DEB_COMMAND: 'curl -u ci:${APTLY_PASSWORD} -X PUT -H "Content-Type: application/json" --data "{}" ${APTLY_URL}/publish/:./indy'
+    DEPLOY_DEB_COMMAND: 'curl -u ${APTLY_USER}:${APTLY_PASSWORD} -X PUT -H "Content-Type: application/json" --data "{}" ${APTLY_URL}/publish/:./indy'
   script:
     - 'apk add --no-cache bash'
     - 'apk add --no-cache curl'
     - curl --version
     - export DEB_FILE="$(ls ./*.deb)"
-    - curl -u ci:${APTLY_PASSWORD} -X POST --header "Content-Type:multipart/form-data" -F file=@${DEB_FILE} ${APTLY_URL}/files/${DEB_NAME}
-    - curl -u ci:${APTLY_PASSWORD} -X POST ${APTLY_URL}/repos/indy-releases/file/${DEB_NAME}
+    - curl -u ${APTLY_USER}:${APTLY_PASSWORD} -X POST --header "Content-Type:multipart/form-data" -F file=@${DEB_FILE} ${APTLY_URL}/files/${DEB_NAME}
+    - curl -u ${APTLY_USER}:${APTLY_PASSWORD} -X POST ${APTLY_URL}/repos/indy-releases/file/${DEB_NAME}
     - echo $DEPLOY_DEB_COMMAND
     - response=$(eval "$DEPLOY_DEB_COMMAND")
     - echo $response
@@ -199,14 +199,14 @@ deploy_live:
     build_number: $PIPELINE_ID
     full_version: '${VERSION}-${build_number}'
     DEB_NAME: 'dariahde-geobrowser_${full_version}.deb'
-    DEPLOY_DEB_COMMAND: 'curl -u ci:${APTLY_PASSWORD} -X PUT -H "Content-Type: application/json" --data "{}" ${APTLY_URL}/publish/:./indy'
+    DEPLOY_DEB_COMMAND: 'curl -u ${APTLY_USER}:${APTLY_PASSWORD} -X PUT -H "Content-Type: application/json" --data "{}" ${APTLY_URL}/publish/:./indy'
   script:
     - 'apk add --no-cache bash'
     - 'apk add --no-cache curl'
     - curl --version
     - export DEB_FILE="$(ls ./*.deb)"
-    - curl -u ci:${APTLY_PASSWORD} -X POST --header "Content-Type:multipart/form-data" -F file=@${DEB_FILE} ${APTLY_URL}/files/${DEB_NAME}
-    - curl -u ci:${APTLY_PASSWORD} -X POST ${APTLY_URL}/repos/indy-releases/file/${DEB_NAME}
+    - curl -u ${APTLY_USER}:${APTLY_PASSWORD} -X POST --header "Content-Type:multipart/form-data" -F file=@${DEB_FILE} ${APTLY_URL}/files/${DEB_NAME}
+    - curl -u${APTLY_USER}:${APTLY_PASSWORD} -X POST ${APTLY_URL}/repos/indy-releases/file/${DEB_NAME}
     - echo $DEPLOY_DEB_COMMAND
     - response=$(eval "$DEPLOY_DEB_COMMAND")
     - echo $response
-- 
GitLab


From ac9bc7e25eb4025cc01ab4042858e5f6ee442f27 Mon Sep 17 00:00:00 2001
From: Stefan Funk <funk@sub.uni-goettingen.de>
Date: Fri, 7 Jan 2022 09:49:00 +0000
Subject: [PATCH 3/6] Fix last projects.gwdg.de reference.

---
 docs/geobrowser.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/geobrowser.rst b/docs/geobrowser.rst
index 6b84c19..30679b2 100644
--- a/docs/geobrowser.rst
+++ b/docs/geobrowser.rst
@@ -209,7 +209,7 @@ Versions and Releases
 
 You can find the current version of the Geo-Browser here: https://geobrowser.de.dariah.eu.
 
-The CHANGELOG is available in the `GIT repository of the Geo-Browser <https://projects.gwdg.de/projects/geo-browser/repository>`_.
+The CHANGELOG is available in the `GIT repository of the Geo-Browser <https://gitlab.gwdg.de/dariah-de/geo-browser/-/blob/main/CHANGELOG.md>`_.
 
 
 Specification for Use
-- 
GitLab


From 023304ad5492bcfd42957ddaa3e1df060a2cb393 Mon Sep 17 00:00:00 2001
From: malzer <malzer@sub.uni-goettingen.de>
Date: Tue, 8 Feb 2022 13:50:35 +0100
Subject: [PATCH 4/6] Fix host URL bug

---
 edit/js/dariah.workflow.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edit/js/dariah.workflow.conf.js b/edit/js/dariah.workflow.conf.js
index 2ca6c76..6651ba8 100644
--- a/edit/js/dariah.workflow.conf.js
+++ b/edit/js/dariah.workflow.conf.js
@@ -26,7 +26,7 @@ export function getDSID(){
     return dsid;
 }
 
-export const host = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port;
+export const host = window.location.protocol + '//' + window.location.host;
 
 // Some prefixes.
 export const logIDPrefix = 'DATASHEET_';
-- 
GitLab


From 8b440baebe616dcb78bddbad15a536bdb9b118b3 Mon Sep 17 00:00:00 2001
From: malzer <malzer@sub.uni-goettingen.de>
Date: Tue, 8 Feb 2022 13:57:43 +0100
Subject: [PATCH 5/6] Update changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9cdcc..5982dcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+Bugfix Version 4.0.6
+====================
+
+* Change _window.hostname_ to _window.host_ to include the correct port automatically
+
+Bugfix Version 4.0.5
+====================
+
+* Add main deploy stage
+* Update documentation
+
+Bugfix Version 4.0.4
+====================
+
+* Fix embed version
+
 Bugfix Version 4.0.3
 ====================
 
-- 
GitLab


From 77ff0fab8cb5dfab0e80a350fc741413504f9f0c Mon Sep 17 00:00:00 2001
From: malzer <malzer@sub.uni-goettingen.de>
Date: Tue, 8 Feb 2022 13:58:15 +0100
Subject: [PATCH 6/6] 4.0.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8c660b..e67632d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dariahde-datasheet-editor",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "dariahde-datasheet-editor",
-      "version": "4.0.5",
+      "version": "4.0.6",
       "dependencies": {
         "clipboard": "^2.0.8",
         "handsontable": "^9.0.2",
diff --git a/package.json b/package.json
index 89664f4..f7507ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dariahde-datasheet-editor",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "private": true,
   "scripts": {
     "build:beta": "webpack --config webpack.config.dev.js",
-- 
GitLab