From 399b20d5b6de0c5c927417136f58713d810e3a48 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 19 Feb 2022 16:04:33 +0100 Subject: [PATCH 1/4] Add .gitattributes --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..b2a7952f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +/assets/.gitignore export-ignore +/config/.gitignore export-ignore +/content/.gitignore export-ignore +/plugins/.gitignore export-ignore +/themes/.gitignore export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore From d8a66b78415ac53f0f90b3aa74214aba7e689150 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 26 Feb 2022 21:42:28 +0100 Subject: [PATCH 2/4] Add 'SECURITY.md' to .htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 5b2d88b0..bfd1eec3 100644 --- a/.htaccess +++ b/.htaccess @@ -4,7 +4,7 @@ #RewriteBase / # Deny access to internal dirs and files by passing the URL to Pico - RewriteRule ^(config|content|vendor|CHANGELOG\.md|composer\.(json|lock|phar))(/|$) index.php [L] + RewriteRule ^(config|content|vendor|CHANGELOG\.md|SECURITY.md|composer\.(json|lock|phar))(/|$) index.php [L] RewriteRule (^\.|/\.)(?!well-known(/|$)) index.php [L] # Enable URL rewriting From 34b793ed82858a0ef3f2c0479c5c18a046ec3fe6 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 26 Feb 2022 21:45:20 +0100 Subject: [PATCH 3/4] composer.json: Update HTTPS links --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e0992672..b026a256 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "project", "description": "Pico is a flat file CMS, this means there is no administration backend and database to deal with. You simply create .md files in the \"content\" folder and that becomes a page.", "keywords": [ "pico", "picocms", "pico-cms", "simple", "flat-file", "cms", "content-management", "website", "markdown-to-html", "php", "markdown", "yaml", "twig", "composer-project" ], - "homepage": "http://picocms.org/", + "homepage": "https://picocms.org/", "license": "MIT", "authors": [ { @@ -13,7 +13,7 @@ }, { "name": "The Pico Community", - "homepage": "http://picocms.org/" + "homepage": "https://picocms.org/" }, { "name": "Contributors", @@ -21,7 +21,7 @@ } ], "support": { - "docs": "http://picocms.org/docs", + "docs": "https://picocms.org/docs", "issues": "https://github.com/picocms/Pico/issues", "source": "https://github.com/picocms/Pico" }, From 42bb337eab209ceb3d639207d3d2d29fe156d9a8 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 26 Feb 2022 21:45:39 +0100 Subject: [PATCH 4/4] Update to Pico 3.0 --- composer.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index b026a256..ab914a5a 100644 --- a/composer.json +++ b/composer.json @@ -26,11 +26,9 @@ "source": "https://github.com/picocms/Pico" }, "require": { - "picocms/pico": "^2.1", - "picocms/pico-theme": "^2.1", - "picocms/pico-deprecated": "^2.1", - "picocms/composer-installer": "^1.0" - }, - "minimum-stability": "beta", - "prefer-stable": true + "picocms/pico": "^3.0", + "picocms/pico-theme": "^3.0", + "picocms/pico-deprecated": "^3.0", + "picocms/composer-installer": "^2.0" + } }