Commit graph

2438 commits

Author SHA1 Message Date
PCoder
56a8ad2edf Changed VM name format for create vm when user is already logged in 2017-09-10 14:52:06 +05:30
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
Pcoder
821f854fc9 Merge pull request #478 from pcoder/task/3484/email_refactoring
Task/3484/email refactoring
2017-09-09 13:22:40 +00:00
PCoder
085786907c Removed a comment 2017-09-09 18:20:03 +05:30
PCoder
6d826fdfd2 Added logged in user as a parameter to create VM 2017-09-09 18:19:09 +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
be55e2613d DE translation fix
Vielen Dank für Ihre Anfrage ->
Vielen Dank für Deine Anfrage
2017-09-09 11:49:38 +05:30
PCoder
e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari
09852aade2 Changelog updated 1.2.1 -> 1.2.2 2017-09-09 02:04:28 +05:30
Arvind Tiwari
c157dd6124 Merge pull request #485 from tiwariav/bugfix/hosting_navbar_logo
bugfix hosting navbar logo link fixed to dcl landing
2017-09-09 00:47:13 +05:30
Arvind Tiwari
e9e72f4883 hosting navbar logo link fixed to dcl landing 2017-09-09 00:46:13 +05:30
Arvind Tiwari
71e6fac997 Merge pull request #482 from tiwariav/task/3759/hosting_navbar
Task/3759 hosting navbar redesign
2017-09-09 00:28:57 +05:30
Arvind Tiwari
3c4eb719b7 Merge pull request #481 from tiwariav/task/3644/login_btn_landing
Task/3644 login btn on dcl navbar
2017-09-09 00:27:35 +05:30
Arvind Tiwari
5c543af25c code cleanup 2017-09-08 20:14:43 +05:30
Arvind Tiwari
a71d4e1c5c Merge branch 'master' into task/3644/login_btn_landing 2017-09-08 20:13:59 +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
223606947a removed icon 2017-09-07 23:48:53 +05:30
Arvind Tiwari
c8b0e2388d login btn special style reset 2017-09-07 23:10:05 +05:30
Arvind Tiwari
73bbe29113 transparent navbar added to signup validate page 2017-09-07 22:47:56 +05:30
Arvind Tiwari
ac2791a3f1 dcl navbar border dadded 2017-09-07 22:44:06 +05:30
Arvind Tiwari
3dca3a40ae Merge pull request #464 from tiwariav/task/3704/my_settings
Task/3704 my settings page
2017-09-07 22:36:09 +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
Arvind Tiwari
43c6abea7e minor changes 2017-09-07 20:27:18 +05:30
Arvind Tiwari
d643e6a5b1 login btn on datacenterlight pages 2017-09-07 20:24:19 +05:30
Arvind Tiwari
a0451fc8ea Merge remote-tracking branch 'ungleich/master' 2017-09-07 19:59:36 +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
M.Ravi
367be351a2 Merged upstream origin 2017-09-06 23:03:53 +02:00
M.Ravi
7c87b520c1 Updated Changelog for 1.2.1 2017-09-06 22:58:44 +02:00
Pcoder
4b2b88fc27 Merge pull request #479 from pcoder/task/3757-2/dcl_add_new_routes
Added /l route to datacenterlight
2017-09-06 20:51:14 +00:00
M.Ravi
4925146715 Using one lettered url patterns for social media links 2017-09-06 22:05:52 +02:00
M.Ravi
c072d382ee Added /fb and /li routes to datacenterlight 2017-09-06 20:13:30 +02:00
PCoder
2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30