Merge branch 'release/1.7.38'

getgrav · Jan 2, 2023 · 95aa57c · 95aa57c
2 parents 00b13d1 + 0bc0e58
commit 95aa57c
Show file tree

Hide file tree

Showing 464 changed files with 691 additions and 607 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,8 +4,13 @@ on:
   release:
     types: [published]
 
+permissions: {}
+
 jobs:
   build:
+    permissions:
+      contents: write # for release creation (svenstaro/upload-release-action)
+
     if: "!github.event.release.prerelease"
     runs-on: ubuntu-latest
 
@@ -52,6 +57,9 @@ jobs:
           file_glob: true
 
   slack:
+    permissions:
+      actions: read # to list jobs for workflow run (technote-space/workflow-conclusion-action)
+
     name: Slack
     needs: build
     runs-on: ubuntu-latest

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ develop ]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
 
   unit-tests:

diff --git a/.github/workflows/trigger-skeletons.yml b/.github/workflows/trigger-skeletons.yml
@@ -12,6 +12,9 @@ on:
         required: true
         default: true
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,10 @@ user/themes/*
 user/localhost/config/security.yaml
 user/config/security.yaml
 
+# Environments
+.env
+.gravenv
+
 # OS Generated
 .DS_Store*
 ehthumbs.db

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# v1.7.38
+## 01/02/2023
+
+1. [](#new)
+    * New `onBeforeSessionStart()` event to be used to store data lost during session regeneration (e.g. login)
+1. [](#improved)
+   * Vendor library updates to latest versions
+   * Updated `bin/composer.phar` to latest `2.4.4` version [#3627](https://github.com/getgrav/grav/issues/3627)
+1. [](#bugfix)
+
+   * Don't fail hard if pages recurse with same path
+   * Github workflows security hardening [#3624](https://github.com/getgrav/grav/pull/3624)
+
 # v1.7.37.1
 ## 10/05/2022
 

diff --git a/assets/.gitkeep b/assets/.gitkeep
@@ -1 +1 @@
-/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
+/* @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved. */
diff --git a/backup/.gitkeep b/backup/.gitkeep
@@ -1 +1 @@
-/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
+/* @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved. */
diff --git a/bin/composer.phar b/bin/composer.phar
diff --git a/bin/gpm b/bin/gpm
@@ -2,7 +2,7 @@
 <?php
 
 /**
- * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/bin/grav b/bin/grav
@@ -2,7 +2,7 @@
 <?php
 
 /**
- * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/bin/plugin b/bin/plugin
@@ -2,7 +2,7 @@
 <?php
 
 /**
- * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/cache/.gitkeep b/cache/.gitkeep
@@ -1 +1 @@
-/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
+/* @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved. */
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/* @copyright Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
		/* @copyright Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved. */
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     <?php
     /**
-     * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+     * @copyright  Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
      * @license    MIT License; see LICENSE file for details.
      */
@@ Expand Down @@