Skip to content

Commit

Permalink
Merge branch 'release/2.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
adrenth committed Mar 8, 2022
2 parents fda0e2a + d20c16b commit b4e434c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 10 deletions.
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Exclude files from exporting
#

/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
3 changes: 3 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
php-version: ${{ matrix.php }}
coverage: none

- name: Add HTTP basic auth credentials
run: echo '${{ secrets.VDLP_OCTOBER_CMS_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json

- name: Validate composer.json and composer.lock
run: composer validate

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.0.4] - 2022-03-08

- Update GitHub workflow configuration
- Add .gitattributes file
- Add version constraint for "october/system"

## [2.0.3] - 2021-09-24

### Fixes
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Adds CSRF protection.
## Requirements

* PHP 7.4 or higher
* October CMS 1.0 or higher

## Installation

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "vdlp/oc-csrf-plugin",
"description": "Adds CSRF protection to October CMS frontend.",
"type": "october-plugin",
"license": "GPL-2.0",
"type": "october-plugin",
"authors": [
{
"name": "Van der Let & Partners",
Expand All @@ -11,6 +11,7 @@
],
"require": {
"php": "^7.4 || ^8.0",
"composer/installers": "^1.0 || ^2.0"
"composer/installers": "^1.0 || ^2.0",
"october/system": "^1.0 || ^2.0"
}
}
17 changes: 9 additions & 8 deletions updates/version.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
1.0.0: "First version of Vdlp.Csrf -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.0.0"
1.1.0: "Added configuration to exclude paths from CSRF validation -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.0"
1.1.1: "Prevent error on CSRF token conversion -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.1"
1.1.2: "Update plugin dependencies"
2.0.0: "Support for PHP 7.4 or higher"
2.0.1: "Fix location of plugin config.php file"
2.0.2: "Minor improvements -- See: CHANGELOG.md"
2.0.3: "Fixes type error when using `csrf_token()` Twig function"
v1.0.0: "First version of Vdlp.Csrf -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.0.0"
v1.1.0: "Added configuration to exclude paths from CSRF validation -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.0"
v1.1.1: "Prevent error on CSRF token conversion -- See: https://github.com/vdlp/oc-csrf-plugin/releases/tag/1.1.1"
v1.1.2: "Update plugin dependencies"
v2.0.0: "Support for PHP 7.4 or higher"
v2.0.1: "Fix location of plugin config.php file"
v2.0.2: "Minor improvements -- See: CHANGELOG.md"
v2.0.3: "Fixes type error when using `csrf_token()` Twig function"
v2.0.4: "Maintenance release"

0 comments on commit b4e434c

Please sign in to comment.