From ceb642b74555aaeaeb50fc80ef243715892933b4 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 10 Oct 2021 22:31:26 +0200 Subject: [PATCH] Updated to latest installer and changelog --- CHANGELOG.md | 6 +++++- composer.json | 4 ++-- config/autoload/installer.global.php | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c30406e2..227b60e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). -## [Unreleased] +## [2.9.0] - 2021-10-10 ### Added * [#1015](https://github.com/shlinkio/shlink/issues/1015) Shlink now accepts configuration via env vars even when not using docker. @@ -26,6 +26,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this The option is disabled by default, as the payload is backwards incompatible. You will need to adapt your webhooks to treat the `shortUrl` property as optional before enabling this option. +* [#1104](https://github.com/shlinkio/shlink/issues/1104) Added ability to disable tracking based on IP addresses. + + IP addresses can be provided in the form of fixed addresses, CIDR blocks, or wildcard patterns (192.168.*.*). + ### Changed * [#1142](https://github.com/shlinkio/shlink/issues/1142) Replaced `doctrine/cache` package with `symfony/cache`. * [#1157](https://github.com/shlinkio/shlink/issues/1157) All routes now support CORS, not only rest ones. diff --git a/composer.json b/composer.json index f117f3d7..aea53f62 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "shlinkio/shlink-config": "^1.2", "shlinkio/shlink-event-dispatcher": "^2.1", "shlinkio/shlink-importer": "^2.3.1", - "shlinkio/shlink-installer": "dev-develop#b45a340 as 6.2", + "shlinkio/shlink-installer": "^6.2", "shlinkio/shlink-ip-geolocation": "^2.0", "symfony/console": "^5.3", "symfony/filesystem": "^5.3", @@ -64,7 +64,7 @@ "devster/ubench": "^2.1", "dms/phpunit-arraysubset-asserts": "^0.3.0", "eaglewu/swoole-ide-helper": "dev-master", - "infection/infection": "^0.24.0", + "infection/infection": "^0.25.0", "phpspec/prophecy-phpunit": "^2.0", "phpstan/phpstan": "^0.12.94", "phpstan/phpstan-doctrine": "^0.12.42", diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php index e89b382d..24461e70 100644 --- a/config/autoload/installer.global.php +++ b/config/autoload/installer.global.php @@ -47,6 +47,7 @@ return [ Option\Tracking\IpAnonymizationConfigOption::class, Option\Tracking\OrphanVisitsTrackingConfigOption::class, Option\Tracking\DisableTrackParamConfigOption::class, + Option\Tracking\DisableTrackingFromConfigOption::class, Option\Tracking\DisableTrackingConfigOption::class, Option\Tracking\DisableIpTrackingConfigOption::class, Option\Tracking\DisableReferrerTrackingConfigOption::class,