Skip to content

Commit

Permalink
Merge pull request #95 from mautic/feature/gdpr
Browse files Browse the repository at this point in the history
GDPR compliance, add new setting to allow disable automatic script loading.
  • Loading branch information
shulard authored Feb 20, 2020
2 parents 250665f + 10bda5f commit 1b680a0
Show file tree
Hide file tree
Showing 10 changed files with 208 additions and 117 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: php

sudo: false

env:
global:
- WP_PHPUNIT=phpunit
Expand All @@ -26,11 +24,15 @@ matrix:
env: WP_VERSION=4.4
- php: 7.0
env: WP_VERSION=4.9
- php: 7.4
env: WP_VERSION=5.3
- php: 7.3
env: WP_VERSION=5.2
- php: 7.3
env: WP_VERSION=5.0 WP_MULTISITE=1 COVERAGE=1 OUTDATED=1
- php: 7.3
env: WP_VERSION=5.3 WP_MULTISITE=1 COVERAGE=1 OUTDATED=1
- php: 7.4
env: WP_VERSION=master
- php: hhvm
env: WP_VERSION=4.7
Expand Down Expand Up @@ -65,7 +67,7 @@ before_script:
- |
# Install the specified version of PHPUnit depending on the PHP version:
case "$TRAVIS_PHP_VERSION" in
7.3|7.2|7.1|hhvm|nightly)
7.4|7.3|7.2|7.1|hhvm|nightly)
echo "Using bundled PHPUnit (7.*)"
composer install --no-interaction --prefer-source
export WP_PHPUNIT=vendor/bin/phpunit
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Added
- Refine wording on the settings page, to be more meaningful.
- Introduce readme.txt generator to avoid manual manipulation during release.
- Add Makefile to simplify the command to run inside the project.
- Add a new `script_location` value to disable script rendering on page load (GDPR compliance).

### Changes
- We are now compatible with PHP 7.4 and WordPress 5.3.*

## [v2.2.2] - 2017-11-13
### Changed
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"require": {
"php": "^5.2|^7.0.0"
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.0",
Expand Down
Loading

0 comments on commit 1b680a0

Please sign in to comment.