X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=CHANGELOG.md;h=9c1581d475f69784a9b5ee4a6377d25dd70b264e;hb=83faedadff76c5bdca036f39f13943f63b27e164;hp=4f72436b67b2a8bfd7f93a3f46c99f56c86c5f22;hpb=decae8c119e0f4750d10909abc47d8afb89af362;p=github%2Fshaarli%2FShaarli.git

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f72436b..9c1581d4 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](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.9.7](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) - 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
 
@@ -177,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
@@ -199,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
@@ -239,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