From f847302acd89d6dcfd3202bd02e83369c6e64953 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 1 Jul 2017 11:22:12 +0530
Subject: [PATCH 1/2] Fixed hosting template footer for unauthenticated case
 (direct payment + order confirmation)

---
 hosting/templates/hosting/base_short.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index c1ba46b1..c3b19c8c 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -131,6 +131,8 @@
             <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
         </div>
     </footer>
+    {% else %}
+        {% include "datacenterlight/includes/_footer.html" %}
     {% endif %}
     <!-- jQuery -->
     <script src="{% static 'hosting/js/jquery.js' %}"></script>

From 871237d84fec92a2336e5dc0f70269e1da374764 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Sun, 2 Jul 2017 15:33:11 +0200
Subject: [PATCH 2/2] Updated Changelog for the release 1.0.18

---
 Changelog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index fcf3c16c..95b7dab8 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+1.0.18: 2017-07-02
+    * [datacenterlight] Introduced the new flow. Landing page -> Payment -> Order confirmation -> Success
+    * [datacenterlight] Fixed issue showing local time to the user in order confirmation page, vm pages (like ssh keys)
+    * [hosting] Fixed responsive issue while user signup
+    * [hosting] Fixed 500 error when user requests for a vm whose id does not belong to him
+    * [datacenterlight] Refactored partially dcl text and dcl support email to be obtained from env parameters
+    * [datacenterlight] Updated DE translations
+    * [hosting] Updated email text for user activation
 1.0.17: 2017-06-16
     * [datacenterlight] Cleanup OrderView useless code
     * [datacenterlight] Replaced GiB to GB
@@ -5,7 +13,7 @@
     * [datacenterlight] Fixed translations
     * [datacenterlight] Added email confirmation feature
     * [datacenterlight] Changed logo on datacerlight dashboard
-    * [datacenterlight] Credit card input disappearance fix 
+    * [datacenterlight] Credit card input disappearance fix
 1.0.16: 2017-06-15
     * [datacenterlight] .po file issue with multiple definition fixed
     * [datacenterlight] Navbar items in dcl user area rearranged