Merge tag 'v0.9.7' into stable

[github/shaarli/Shaarli.git] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47a902f0fa20c1c7d59cc30f2804f74810e1d39e..9c1581d475f69784a9b5ee4a6377d25dd70b264e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.9.4](https://github.com/shaarli/Shaarli/releases/tag/v0.9.4) - UNPUBLISHED
+## [v0.9.7](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) - 2018-06-20
+### Changed
+- Build the Docker images from the local Git sources
+
+
+## [v0.9.6](https://github.com/shaarli/Shaarli/releases/tag/v0.9.6) - 2018-03-25
+### Changed
+- htaccess: prevent accessing resources not managed by SCM
+- htaccess: always forward the 'Authorization' HTTP header
+
+
+## [v0.9.5](https://github.com/shaarli/Shaarli/releases/tag/v0.9.5) - 2018-02-02
+### Fixed
+- Fix a warning happening when `php-intl` is not installed on the system
+- Fix warnings happening when updating from legacy SebSauvage version
+
+## [v0.9.4](https://github.com/shaarli/Shaarli/releases/tag/v0.9.4) - 2018-01-30
 ### Added
 - Enable translations: Shaarli is now also available in French. Other language translations are welcome!
 - Add EditorConfig configuration
@@ -20,6 +36,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Improve messages if there is no plugin or parameter available in the admin page
 - Increase buffer size for cURL download
 - Force HTTPS if the original port is 443 behind a reverse proxy (workaround)
+- Improve page title retrieval performances
 
 ### Removed
 - Remove redirector setting from Configure page
@@ -160,7 +177,40 @@ Theming:
 - `composer.lock` is now included in git file to allow proper `composer install`
 - History mechanism which logs link addition/modification/deletion
 
+## [v0.8.7](https://github.com/shaarli/Shaarli/releases/tag/v0.8.7) - 2018-06-20
 ### Changed
+- Build the Docker image from the local Git sources
+
+### Removed
+- Disable PHP 5.3 Travis build (unsupported)
+
+## [v0.8.6](https://github.com/shaarli/Shaarli/releases/tag/v0.8.6) - 2018-02-19
+### Changed
+<<<<<<< HEAD
+- Run version check tests against the 'stable' branch
+
+
+## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04
+
+ **XSS vulnerability fixed. Please update.**
+
+### Security
+- Fix an XSS (cross-site-scripting) vulnerability in `index.php`
+
+
+## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04
+### Security
+- Markdown plugin: escape HTML entities by default
+
+
+## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20
+
+### Fixed
+
+- PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template.
+
+## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
+=======
 - Docker: enable nginx URL rewriting for the REST API
 - Theming:
     - Move `user.css` to the `data` folder
@@ -182,6 +232,7 @@ Theming:
 - Partial namespace support for Shaarli classes
 - Shaarli version is now only present in `shaarli_version.php`
 - Human readable maximum file size upload
+>>>>>>> v0.9.7
 
 
 ### Removed
@@ -222,9 +273,12 @@ Theming:
 ### Fixed
 - PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template.
 
+<<<<<<< HEAD
+=======
 ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
 ### Fixed
 
+>>>>>>> v0.9.7
 - Editing a link created before the new ID system would change its permalink.
 
 ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12