Commit graph

647 commits

Author SHA1 Message Date
PCoder
1836d315cd Added query param to distinguish confirm order from invoice 2017-09-10 12:22:32 +05:30
PCoder
b1589e9c68 Reorganized imports hosting/views.py 2017-09-09 21:41:20 +05:30
PCoder
c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
PCoder
d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
M.Ravi
e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
2017-09-09 13:27:17 +02:00
M.Ravi
c8baf3d4c1 Implemented post method for hosting OrderDetailView 2017-09-09 12:06:29 +02:00
PCoder
1d5f92f7e1 Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email 2017-09-09 12:12:56 +05:30
PCoder
e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari
e9e72f4883 hosting navbar logo link fixed to dcl landing 2017-09-09 00:46:13 +05:30
Arvind Tiwari
3852d26f37 merged master 2017-09-08 20:13:17 +05:30
Arvind Tiwari
60bc1a86b3 font weight on mobile 2017-09-08 03:52:24 +05:30
Arvind Tiwari
fc170462e2 font weight on mobile 2017-09-08 03:41:25 +05:30
Arvind Tiwari
bbee940720 padding fix 2017-09-08 03:19:08 +05:30
Arvind Tiwari
3b8c3265ca Merge pull request #484 from tiwariav/task/3779/transparent_navbar
Task/3779 transparent navbar on signup-validate pages
2017-09-08 02:57:10 +05:30
Arvind Tiwari
6a56f4c689 logo position fix 2017-09-08 02:43:11 +05:30
Arvind Tiwari
9721784ff2 logo href fixed 2017-09-08 02:32:46 +05:30
Arvind Tiwari
4937baa2e0 dropdown style updated 2017-09-08 02:22:03 +05:30
Arvind Tiwari
d5c0fef965 Merge pull request #483 from tiwariav/task/3775/hosting_default_page
Task/3775 hosting/dashboard as default page
2017-09-08 02:03:08 +05:30
Arvind Tiwari
84d35ea916 padding fixed 2017-09-08 00:11:20 +05:30
Arvind Tiwari
b4641e9dfd font wieght 300 2017-09-08 00:07:09 +05:30
Arvind Tiwari
73bbe29113 transparent navbar added to signup validate page 2017-09-07 22:47:56 +05:30
Arvind Tiwari
e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard 2017-09-07 22:24:03 +05:30
Arvind Tiwari
db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
M.Ravi
0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
M.Ravi
67ab4ef0a1 hosting: Added order-confirmation url 2017-09-06 23:50:19 +02:00
M.Ravi
df23862ea1 Added per month text for price 2017-09-06 23:49:38 +02:00
PCoder
2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30
Arvind Tiwari
d13d9bf441 removed edit option from card details 2017-09-05 22:09:18 +05:30
Arvind Tiwari
5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
Arvind Tiwari
3ff0c4a1a2 merged master 2017-09-04 23:52:22 +05:30
PCoder
f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
PCoder
8ac8b25d78 Updated new vm email template 2017-09-04 12:32:53 +05:30
M.Ravi
f7129e0b23 Removed an invalid quote from cancel email template 2017-09-03 17:49:31 +02:00
M.Ravi
da4ca01524 Fixed hosting django.po error 2017-09-03 17:16:25 +02:00
M.Ravi
43e4c021a7 Removed order id from cancel vm email templates 2017-09-03 17:13:49 +02:00
M.Ravi
a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
M.Ravi
0d4c40cfa2 Fixed missing trans tag in _footer.html 2017-09-03 12:44:42 +02:00
PCoder
f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi
8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi
50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder
b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder
e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder
7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
PCoder
1c42623964 Fixed some password reset email translation issues 2017-09-02 16:24:25 +05:30
PCoder
f701f10e24 Added missing site_name 2017-09-02 16:07:05 +05:30
PCoder
22f07837e0 Added missing password_reset_url 2017-09-02 16:05:24 +05:30
PCoder
00e4ae5b76 Added missing new line character 2017-09-02 16:03:39 +05:30
PCoder
b4ba882c9c Added password reset email translation 2017-09-02 16:01:39 +05:30
PCoder
7c70ee637a Updated password reset template 2017-09-02 15:56:17 +05:30
Arvind Tiwari
95f4cb3753 fix 2017-09-02 03:14:02 +05:30