From 6a6f40370434b1b79f4e24ba54a3f163177940b2 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 26 May 2017 02:47:20 +0530 Subject: [PATCH 1/5] Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html --- datacenterlight/templates/datacenterlight/pricing.html | 2 +- hosting/templates/hosting/payment.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 03742516..55123171 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -128,7 +128,7 @@
- 2 GiB RAM + 2 GB RAM
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 459dcf0b..d64fbeae 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -104,10 +104,10 @@ class="pull-right">{{request.session.specs.cpu|floatformat}}


Memory {{request.session.specs.memory|floatformat}} GiB

+ class="pull-right">{{request.session.specs.memory|floatformat}} GB


Disk space {{request.session.specs.disk_size|floatformat}} GiB

+ class="pull-right">{{request.session.specs.disk_size|floatformat}} GB


Total

{{request.session.specs.price }} CHF

From f8bbd94f8fbc600e55111ca6a387f8622e9b6f61 Mon Sep 17 00:00:00 2001 From: modulos Date: Fri, 26 May 2017 17:12:37 +0200 Subject: [PATCH 2/5] Change 15 to 10 GB Storage --- datacenterlight/templates/datacenterlight/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 292b233f..89297926 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -240,7 +240,7 @@

2 GB RAM,

-

{% trans "15 GB Storage (SSD)" %}

+

{% trans "10 GB Storage (SSD)" %}

{% trans "Order Now!" %} From b8242b3345ac34c65ba59ba45137116ae7744b99 Mon Sep 17 00:00:00 2001 From: Levi Date: Fri, 26 May 2017 12:48:57 -0500 Subject: [PATCH 3/5] added changelog for prod deploy (2017-05-26) --- Changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 1d2d8a8f..76ff50b1 100644 --- a/Changelog +++ b/Changelog @@ -1,2 +1,5 @@ 1.0.0: 2017-05-25 - * Initial stable release \ No newline at end of file + * Initial stable release +1.0.1: 2017-05-26 + * [datacenterlight] Allow storage to shrink / grow only in 10th of GB + * [datacenterlight] Fix initially shown price From 47be413298266120efbd46b31848be4579833769 Mon Sep 17 00:00:00 2001 From: Levi Date: Sun, 28 May 2017 15:01:18 -0500 Subject: [PATCH 4/5] fixed redirect link --- utils/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/views.py b/utils/views.py index 75506959..b547506f 100644 --- a/utils/views.py +++ b/utils/views.py @@ -40,6 +40,8 @@ class LoginViewMixin(FormView): def get_success_url(self): next_url = self.request.POST.get('next', self.success_url) + if not next_url: + return self.success_url return next_url def form_valid(self, form): @@ -54,7 +56,6 @@ class LoginViewMixin(FormView): return HttpResponseRedirect(self.get_success_url()) def get(self, request, *args, **kwargs): - if self.request.user.is_authenticated(): return HttpResponseRedirect(self.get_success_url()) From 079970852a9bcf410ad08f7bb08eb75386fbcef5 Mon Sep 17 00:00:00 2001 From: Levi Date: Sun, 28 May 2017 15:03:01 -0500 Subject: [PATCH 5/5] added changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 76ff50b1..7df1f113 100644 --- a/Changelog +++ b/Changelog @@ -3,3 +3,5 @@ 1.0.1: 2017-05-26 * [datacenterlight] Allow storage to shrink / grow only in 10th of GB * [datacenterlight] Fix initially shown price +1.0.2: 2017-05-28 + * [datacenterlight] Fixed login redirecting to blank page after logout