diff --git a/.changelog/current/2493-compatibility-nc-30.md b/.changelog/current/2493-compatibility-nc-30.md new file mode 100644 index 000000000..7747e0d0f --- /dev/null +++ b/.changelog/current/2493-compatibility-nc-30.md @@ -0,0 +1,3 @@ +# Maintenance + +- Mark the app as compatible with NC 30 diff --git a/.github/actions/deploy/appinfo/info.xml.dist b/.github/actions/deploy/appinfo/info.xml.dist index 0126b2d1d..019436fd7 100755 --- a/.github/actions/deploy/appinfo/info.xml.dist +++ b/.github/actions/deploy/appinfo/info.xml.dist @@ -20,7 +20,7 @@ https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - + diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 652f8100f..27cfb1b20 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -113,7 +113,7 @@ jobs: database: - mysql coreVersion: - - 28 + - 30 phpVersion: - "8.3" httpServer: @@ -124,7 +124,7 @@ jobs: phpVersion: "8.1" httpServer: "apache" - database: pgsql - coreVersion: 28 + coreVersion: 29 phpVersion: "8.2" httpServer: "nginx" diff --git a/.hook-checkout/.gitignore b/.hook-checkout/.gitignore index 5e660dc18..f0d0f3384 100644 --- a/.hook-checkout/.gitignore +++ b/.hook-checkout/.gitignore @@ -1 +1,2 @@ /checkout +/tmp diff --git a/.hooks/pre-push b/.hooks/pre-push index 25cd53a89..f018cacc6 100755 --- a/.hooks/pre-push +++ b/.hooks/pre-push @@ -49,8 +49,8 @@ if [ -n "$run_check" ] then # Clean current folder - rm -rf .hook-checkout/checkout - mkdir .hook-checkout/checkout + rm -rf .hook-checkout/checkout .hook-checkout/tmp + mkdir .hook-checkout/checkout .hook-checkout/tmp # Clone the latest code base to the folder and apply the staged changes git archive --format tar $localRef | tar x -C .hook-checkout/checkout @@ -119,7 +119,8 @@ then cd .hook-checkout/checkout if [ -x "$(which xmllint)" ] then - xmllint --noout --quiet --schema <(curl -sL 'https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd') appinfo/info.xml || { \ + curl -sL 'https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd' -o '../tmp/info.xsd' + xmllint --noout --quiet --schema ../tmp/info.xsd appinfo/info.xml || { \ echo 'The app info file does not conform the XSD file.'; (( retVal |= 64 )); } else echo 'WARNING: Could not check the XML file as xmllint was not found in the path.' diff --git a/appinfo/info.xml b/appinfo/info.xml index b08b2f143..3fdfe02d7 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,7 +20,7 @@ https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - + diff --git a/src/components/RecipeView/RecipeView.vue b/src/components/RecipeView/RecipeView.vue index 2c88baebe..cd755c2bf 100644 --- a/src/components/RecipeView/RecipeView.vue +++ b/src/components/RecipeView/RecipeView.vue @@ -1160,15 +1160,15 @@ main { .recipeYieldInput { width: 75px; + /* Firefox */ + -moz-appearance: textfield; + /* Chrome, Safari, Edge */ &::-webkit-inner-spin-button, &::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } - - /* Firefox */ - -moz-appearance: textfield; }