From bf249c889c6236d329da2c156e4a19b17164cf57 Mon Sep 17 00:00:00 2001
From: bertrandboudaud <bertrand.boudaud@gmail.com>
Date: Mon, 11 Oct 2021 07:55:28 +0200
Subject: [PATCH] release 1.15.0

---
 CHANGELOG.rst  | 26 ++++++++++++++++++++++++++
 CMakeLists.txt |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 293c88a46..2b701df5d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,32 @@
 SmartPeak Changelog
 ===================
 
+v1.15.0 (2020-10-11)
+--------------------
+
+Features
+~~~~~~~~
+- "Select All" button when generating Report `(#427) <https://github.com/AutoFlowResearch/SmartPeak/pull/427>`_
+- Added options to SmartPeakCLI `(#429) <https://github.com/AutoFlowResearch/SmartPeak/pull/429>`_
+    - --input-file (-f): Override input file.
+    - --parameter (-p): Override parameter.
+    - --mzml (-z): Overrides the default location for the mzML directory.
+    - --reports-out-dir (-ro): Overrides the default location for reports.
+    - --output-features (-o): Overrides the default location for output features.
+    - --input-features (-i): Overrides the default location for input features.
+- Create Report: Pivotable and FeatureDB button to use FilePickerHandler `(#431) <https://github.com/AutoFlowResearch/SmartPeak/pull/431>`_
+
+Fix
+~~~
+- Fixed number of transitions does not appear after loading `(#430) <https://github.com/AutoFlowResearch/SmartPeak/pull/430>`_
+
+Changes
+~~~~~~~
+- Changed options to SmartPeakCLI `(#429) <https://github.com/AutoFlowResearch/SmartPeak/pull/429>`_
+    - --output (-o) is now replaced by either --output-features or --reports-out-dir
+    - --disable-progressbar short form has been replaced from -p to -pg
+    - --integrity short form has been replaced from -i to -t
+
 v1.14.0 (2020-09-30)
 --------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7563fd1cb..b01dbf4eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Windows")
 # SmartPeak Version Information
 #------------------------------------------------------------------------------
 set(SMARTPEAK_PACKAGE_VERSION_MAJOR 1)
-set(SMARTPEAK_PACKAGE_VERSION_MINOR 14)
+set(SMARTPEAK_PACKAGE_VERSION_MINOR 15)
 set(SMARTPEAK_PACKAGE_VERSION_PATCH 0)
 
 #------------------------------------------------------------------------------