From fe3a1d8c8cffec6e8774f31118d4ce88b104dc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmlindenhofer=E2=80=9D?= Date: Tue, 17 Oct 2023 10:39:15 +0200 Subject: [PATCH 1/6] try1 --- .idea/workspace.xml | 61 ++++++++++++++++++++++++++------------------- composer.json | 2 +- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7fb5018..3870a9a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,12 +1,13 @@ + + - - - + + - $PROJECT_DIR$/composer.json - - - + @@ -64,6 +63,13 @@ + + + + + @@ -128,24 +135,25 @@ - - - - - - - - - + + + + @@ -157,6 +165,7 @@ @@ -191,7 +200,7 @@ - diff --git a/composer.json b/composer.json index bb8f0d4..c04508b 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require": { "php": ">=5.6", - "silverstripe/cms": "^4.0", + "silverstripe/cms": "^4.0 | ^5", "silverstripe/framework": "^4.0" }, "autoload": { From 304d0542a0d487b3aca4278a94b0070559df5556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmlindenhofer=E2=80=9D?= Date: Tue, 17 Oct 2023 10:42:19 +0200 Subject: [PATCH 2/6] rename branch --- .idea/workspace.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3870a9a..f2c33c6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,10 +4,7 @@ - - - - + From 46cd943624f10fac8722b604acd8d0b3404f15a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmlindenhofer=E2=80=9D?= Date: Thu, 19 Oct 2023 15:59:51 +0200 Subject: [PATCH 3/6] safe change --- .idea/workspace.xml | 215 +---------------------- composer.json | 6 +- src/Model/Extension/SeoPageExtension.php | 2 +- 3 files changed, 12 insertions(+), 211 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f2c33c6..cfdaa3a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,225 +4,26 @@ - + + + + + - - $PROJECT_DIR$/composer.json + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -