From a796ba28eeb6c4aa7d9e259390774885009a688a Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Mon, 12 Mar 2018 21:26:42 +0100
Subject: [PATCH] updates for version 1.2.0 release

---
 CHANGELOG.md             | 14 ++++++++++++++
 waitlist/data/version.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d6aca2b..056674f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,18 @@
 #Changelog
+* 1.2.0
+  * Features
+    * Added icon for wardec check to xup page
+      - red = active wardec
+      - orange = wardec starting soon
+      - ? = there was an error checking
+  * Fixes
+    * Fixed a bug with not applying the right default theme
+    * An id being used double on main page
+    * updated editabletables code to hopefully workaround some bugs
+      - this should also enable sorting by names
+  * Changes
+    * Database access has all been converted to using ORM
+    * Other db reladed changes to better support different databases (like pgsql)
 * 1.1.4
   * Fixes
     * Fixed error handling for invalidated refresh tokens
diff --git a/waitlist/data/version.py b/waitlist/data/version.py
index 0a800830..cbf44f55 100644
--- a/waitlist/data/version.py
+++ b/waitlist/data/version.py
@@ -1 +1 @@
-version = "1.1.4-$Format:%h$"
+version = "1.2.0-$Format:%h$"