From 98ad26e2ec22639d485f73725d713a61eb86e4bc Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Wed, 1 Sep 2021 13:54:23 +0200 Subject: [PATCH 01/28] Restrict building to master branch --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13ea7724..81f457ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,11 @@ name: Build on: push: + branches: + - master + pull_request: + branches: + - master repository_dispatch: types: [content-update] From 580099409a2f80e44f7a024b0d9216e1f8ba023c Mon Sep 17 00:00:00 2001 From: pkdxqen Date: Thu, 21 Oct 2021 12:17:41 +0000 Subject: [PATCH 02/28] new truststore file for QTILL merchants --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index f3479a3b..e7bae22a 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit f3479a3b5fe0f6150011852b412736aa552c0139 +Subproject commit e7bae22ab93577239964e42aff1654e07096ba19 From ae8fb68a270413a414381a25687e36cb21f0e5c7 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 21 Oct 2021 15:20:58 +0200 Subject: [PATCH 03/28] Build Fix (#3) * Build all branches * Pin package versions * Enable build --- .github/workflows/build.yml | 5 ----- antora.dockerfile | 4 ++-- scripts/invalid_refs.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81f457ec..13ea7724 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,11 +2,6 @@ name: Build on: push: - branches: - - master - pull_request: - branches: - - master repository_dispatch: types: [content-update] diff --git a/antora.dockerfile b/antora.dockerfile index 0fd3c485..a2a98adc 100644 --- a/antora.dockerfile +++ b/antora.dockerfile @@ -3,6 +3,6 @@ ENV DOCSEARCH_ENABLED=true ENV DOCSEARCH_ENGINE=lunr ENV NODE_PATH="/usr/local/lib/node_modules" ENV DOCSEARCH_INDEX_VERSION=latest -RUN yarn global add http-server onchange -RUN yarn global add antora-site-generator-lunr +RUN yarn global add http-server@13.0.2 onchange@7.1.0 +RUN yarn global add antora-site-generator-lunr@0.6.1 WORKDIR /srv/docs diff --git a/scripts/invalid_refs.sh b/scripts/invalid_refs.sh index ad73c802..9cc19374 100644 --- a/scripts/invalid_refs.sh +++ b/scripts/invalid_refs.sh @@ -13,7 +13,7 @@ INVALID_REFS=$( N_REFS=$(echo "${INVALID_REFS}" | wc -l | xargs) N_FILES=$(echo "${INVALID_REFS}" | cut -d ':' -f1 | uniq | wc -l | xargs) -[[ N_REFS >= 1 ]] && exit 0 +[[ ${N_REFS} -lt 1 ]] && exit 0 echo "::warning::${N_FILES} pages contain invalid references. Please check build log for details!" echo "::group::Click to show files" From aab064c86f6adc564da40a6dda11ea7bcfc6684c Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:29:44 +0100 Subject: [PATCH 04/28] Update to latest content version --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index e44ac1d7..203973e6 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit e44ac1d7948365ea8613cabac6058aed07268d62 +Subproject commit 203973e6caa0cac79d7e8b84cdb1191caf86c6c5 From 4ee4e5e0dd672e238754ec104770b658f219bb0b Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:35:54 +0100 Subject: [PATCH 05/28] Wipe gh-pages history on deploy --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81f457ec..b5af9233 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: with: target_branch: gh-pages build_dir: build/site - keep_history: true + keep_history: false fqdn: ${{ secrets.FQDN }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5eef8c6f7ff904a870078fac6d3eb13ec2e3db3b Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:41:40 +0100 Subject: [PATCH 06/28] Change UI submodule to master --- ui-customizations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-customizations b/ui-customizations index cf90589f..3230b437 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit cf90589f6020838e8a2caede2e8d822058217d18 +Subproject commit 3230b437dff58d327920e67c9900c7f11330adc6 From 41ac0a3d1547e6eb2d6ed7f10844584b0a9ddeb9 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:47:20 +0100 Subject: [PATCH 07/28] Bump content submodule ref --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 203973e6..83167f47 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 203973e6caa0cac79d7e8b84cdb1191caf86c6c5 +Subproject commit 83167f47c272547a2781284fdb9ee1ce69102bcb From 4ca59ca956f3d3575afa2eceb8aa97864c102c26 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 09:47:24 +0000 Subject: [PATCH 08/28] Enable main repo trigger on content update --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 203973e6..83167f47 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 203973e6caa0cac79d7e8b84cdb1191caf86c6c5 +Subproject commit 83167f47c272547a2781284fdb9ee1ce69102bcb From a8f8e429552270d788dd1029c005adfa39168d74 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 11:02:52 +0100 Subject: [PATCH 09/28] Disable redirect renames --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5af9233..13bb8c30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,11 +48,11 @@ jobs: fqdn: ${{ secrets.FQDN }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set Redirects - id: set-redirects - if: success() && steps.branch.outputs.name == 'master' - run: bash scripts/redirect_renames.sh - env: - BOT_USER: ${{ secrets.BOT_USER }} - BOT_EMAIL: ${{ secrets.BOT_EMAIL }} - BOT_TOKEN: ${{ secrets.BOT_PAT }} + # - name: Set Redirects + # id: set-redirects + # if: success() && steps.branch.outputs.name == 'master' + # run: bash scripts/redirect_renames.sh + # env: + # BOT_USER: ${{ secrets.BOT_USER }} + # BOT_EMAIL: ${{ secrets.BOT_EMAIL }} + # BOT_TOKEN: ${{ secrets.BOT_PAT }} From d5028648a7f9d613371e618e41bce7b4b1338be5 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Thu, 27 Jan 2022 11:11:20 +0100 Subject: [PATCH 10/28] Update UI ref again --- ui-customizations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-customizations b/ui-customizations index 3230b437..cf90589f 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit 3230b437dff58d327920e67c9900c7f11330adc6 +Subproject commit cf90589f6020838e8a2caede2e8d822058217d18 From e95f63f21e768ab2dd9a8cb8eae93fccac66fa3b Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Fri, 28 Jan 2022 10:31:21 +0100 Subject: [PATCH 11/28] Change webserver to nginx --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c37ee713..d27177cf 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ antora.build: # antora.run: @ Serves documentation output (on port 8051) antora.run: - docker-compose run --service-ports antora http-server build/site -c-1 + docker run -p 8051:80 -v $(pwd)/build/site:/usr/share/nginx/html:ro nginx:alpine # antora.watch: @ Watches for documentation changes and rebuilds (to build/site) antora.watch: From 0b8e213fa6e4d73e04f7b26ce083e8f755cdc27f Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Fri, 28 Jan 2022 14:24:39 +0000 Subject: [PATCH 12/28] Create start page --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 83167f47..8c2692c4 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 83167f47c272547a2781284fdb9ee1ce69102bcb +Subproject commit 8c2692c4f674079f5a64439d5514fe70021f3435 From 8c23bb8a97a6e8ee513f300338c481d63bb306ce Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:40:14 +0100 Subject: [PATCH 13/28] Update UI to latest changes, revert Makefile --- Makefile | 3 +-- ui-customizations | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d27177cf..0b295339 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,7 @@ antora.build: # antora.run: @ Serves documentation output (on port 8051) antora.run: - docker run -p 8051:80 -v $(pwd)/build/site:/usr/share/nginx/html:ro nginx:alpine - + docker-compose run --service-ports antora http-server build/site -c-1 # antora.watch: @ Watches for documentation changes and rebuilds (to build/site) antora.watch: docker-compose run -u $$(id -u) -T antora onchange \ diff --git a/ui-customizations b/ui-customizations index cf90589f..7c8a7275 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit cf90589f6020838e8a2caede2e8d822058217d18 +Subproject commit 7c8a7275012aa989e7c3351003be320bfcb14fb3 From 418cb6ad5623a20c7b7c2b685adc3bd624c0711f Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 31 Jan 2022 15:19:43 +0000 Subject: [PATCH 14/28] Minor content fixes --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 8c2692c4..1f17163c 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 8c2692c4f674079f5a64439d5514fe70021f3435 +Subproject commit 1f17163c069aef1a52d807e2533e932dd1175087 From 062d1fb420bb2dc0d5892a4db705e933c5e0b3bc Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:25:02 +0100 Subject: [PATCH 15/28] Bump UI rev for release --- ui-customizations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-customizations b/ui-customizations index 7c8a7275..e1a70b35 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit 7c8a7275012aa989e7c3351003be320bfcb14fb3 +Subproject commit e1a70b3525ac8d3b138ec5f52b7d3810b8f43882 From f239cf649e9c4dd03293cfda9c4d134327009225 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 11:51:12 +0000 Subject: [PATCH 16/28] added new plugin pages --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 1f17163c..b6f9d2b3 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 1f17163c069aef1a52d807e2533e932dd1175087 +Subproject commit b6f9d2b384c7a1aa6ba1bfcd4765f6ae04a74eaa From af77b0601f643c0e9e0ef695a31ce3500a4543c7 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 11:53:27 +0000 Subject: [PATCH 17/28] added new index page --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index b6f9d2b3..28454405 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit b6f9d2b384c7a1aa6ba1bfcd4765f6ae04a74eaa +Subproject commit 284544050fc83979245c5559c8e5815e504f5ae1 From 04f930dfc3ff582309803795c8cfda7fa065e9c2 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 14:19:36 +0000 Subject: [PATCH 18/28] made changes in plugin pages --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 28454405..5f2da8e6 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 284544050fc83979245c5559c8e5815e504f5ae1 +Subproject commit 5f2da8e60c9376440537d51aaf1053f95c8b3bff From 86dbab82801d4b31ee8c1e9c1057fe0684e1c26a Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 14:40:19 +0000 Subject: [PATCH 19/28] added images for plugins --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 5f2da8e6..a1b731c0 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 5f2da8e60c9376440537d51aaf1053f95c8b3bff +Subproject commit a1b731c037436deee37bcb86537d94a0ca5de393 From 95cb2f6bc3225461f2206fe700038553fad338f0 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 14:43:47 +0000 Subject: [PATCH 20/28] added prestashop link --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index a1b731c0..01b3f0fd 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit a1b731c037436deee37bcb86537d94a0ca5de393 +Subproject commit 01b3f0fdda5ddec70c0f0c0f0e1ed2f5880fcfbf From 1a4c7cbbf8b4e5e779fa964fa8ea19561a9df6bb Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Wed, 2 Feb 2022 14:52:48 +0000 Subject: [PATCH 21/28] added support image --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 01b3f0fd..54d1004b 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 01b3f0fdda5ddec70c0f0c0f0e1ed2f5880fcfbf +Subproject commit 54d1004bbd7b1554b3eb5a458e2ce156dc041fa0 From fbe1eae617e48bdb30202c042e3afa0ddad143c6 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Wed, 2 Feb 2022 14:54:56 +0000 Subject: [PATCH 22/28] CSS fix for go-live --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 54d1004b..8283aadd 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 54d1004bbd7b1554b3eb5a458e2ce156dc041fa0 +Subproject commit 8283aadd5cd3e058b2235d4b9aadab0440631b2b From 1e2e15e082c0ea323a179e28a18daf41035a8ff1 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Wed, 2 Feb 2022 15:02:21 +0000 Subject: [PATCH 23/28] Remove remote CSS --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 8283aadd..6e57c273 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 8283aadd5cd3e058b2235d4b9aadab0440631b2b +Subproject commit 6e57c2730140c3000be4b415382b9c085f64537f From 0515d0b03c86d4f7d504009c72ac0fc334cec827 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Wed, 2 Feb 2022 16:32:41 +0100 Subject: [PATCH 24/28] Bump UI ref --- ui-customizations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-customizations b/ui-customizations index e1a70b35..7f731658 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit e1a70b3525ac8d3b138ec5f52b7d3810b8f43882 +Subproject commit 7f73165898433fa331a6b612f56793f9331d6846 From 3ba879f8d9b23980f6611cada62ef5abd3f37fa3 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Fri, 4 Feb 2022 08:02:08 +0000 Subject: [PATCH 25/28] Merge branch 'master' of https://github.com/qenta-cee/qenta-docs-content --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 6e57c273..71f2e5d0 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 6e57c2730140c3000be4b415382b9c085f64537f +Subproject commit 71f2e5d0aea9142b469f8f3ff0cf9418a9f18263 From e8474453d4f7d9a785a45fe5e77d5f36ac4c3c92 Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Fri, 4 Feb 2022 08:59:13 +0000 Subject: [PATCH 26/28] changed anchors --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index 71f2e5d0..c7b679ac 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 71f2e5d0aea9142b469f8f3ff0cf9418a9f18263 +Subproject commit c7b679ac68c7fea13e514996c2d92caeb7fe9b88 From 8077780df510218ca38fb67426a34c7fe423d4fa Mon Sep 17 00:00:00 2001 From: Melisa09 Date: Fri, 4 Feb 2022 12:15:56 +0000 Subject: [PATCH 27/28] made changes --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index c7b679ac..a7155a67 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit c7b679ac68c7fea13e514996c2d92caeb7fe9b88 +Subproject commit a7155a677e75ad4a4ee7b2ab5ecf856393d2ace4 From e101c61d432daf3df97e03d6441864468c128c83 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Tue, 8 Feb 2022 16:31:12 +0100 Subject: [PATCH 28/28] Attempt to fix runaway submodule ref --- content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content b/content index a7155a67..47ed4ed7 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit a7155a677e75ad4a4ee7b2ab5ecf856393d2ace4 +Subproject commit 47ed4ed7bdc3ea1f662f91b008388314037c6c30