From c23cc823286dec974d31b8b9b712007484c39818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= <cedric@cedricbonhomme.org>
Date: Fri, 20 Jul 2018 14:21:36 +0200
Subject: [PATCH] Updated CHANGELOG for the new release.

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 VERSION.json |  2 +-
 package.json |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b21f5..c9ca09f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,35 @@
 MONARC Changelog
 ================
 
+## 2.6.0 (2018-07-20)
+
+### New
+
+- MONARC users who open the home page in the web interface will see an image
+  in the bottom left corner with the text "up-to-date" in green, "update
+  available" in orange or "security update available" in red.
+  This will make outdated version more visible for users of MONARC. This
+  version checking is performed thanks to a
+  [dedicated service](https://version.monarc.lu/version/MONARC).
+
+### Enhancement
+
+- the import and export functions have been improved;
+- creation of recommendation and missing field (#115);
+- make an easy link to implement the recommendation directly from the risk view
+  (#112).
+
+### Fix
+
+- fixed a bug in the table Risk treatment plan management.
+- problem on date parsing with the date-picker with non-US browsers (when using
+  date.toLocaleString) (#117)
+- it is not possible to reset the ``duedate`` attribute of a recommendation
+  since the introduction of the date-picker (#116)
+- review and correct the functionality of import by fusion or merge (#62)
+- minor translations fixes.
+
+
 ## 2.5.0 (2018-07-04)
 
 ### New
diff --git a/VERSION.json b/VERSION.json
index eb131d0..df0b86e 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":5, "hotfix":0}
+{"major":2, "minor":6, "hotfix":0}
diff --git a/package.json b/package.json
index 5c3981e..342bde7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "MONARC Frontoffice App",
   "private": true,
   "repository": {