PCoder
|
656e7563fd
|
Merged upstream master into tiwariav-task/3756/landing_billing_page
|
2017-09-24 01:31:57 +05:30 |
|
PCoder
|
300997699a
|
Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm
|
2017-09-24 01:08:15 +05:30 |
|
PCoder
|
537e350c8c
|
Redirecting users on creation of accounts to my virtual machines page
|
2017-09-24 00:22:18 +05:30 |
|
Arvind Tiwari
|
313b2b2f57
|
fixed vreate vm error
|
2017-09-23 23:47:25 +05:30 |
|
Arvind Tiwari
|
cd3fdcf935
|
Updated pre-changelog 1.2.3
|
2017-09-23 23:33:48 +05:30 |
|
Arvind Tiwari
|
ae1a317bf9
|
Merge pull request #486 from tiwariav/task/3728/vm_teminate_animation
task/3728 vm termination animation
|
2017-09-23 23:26:00 +05:30 |
|
Arvind Tiwari
|
7456baac16
|
merged master
|
2017-09-23 23:05:10 +05:30 |
|
Arvind Tiwari
|
eca7ba01c5
|
fixed duplicate translation
|
2017-09-23 22:54:17 +05:30 |
|
Arvind Tiwari
|
363017d85f
|
Merge pull request #488 from tiwariav/task/3777/hosting_calculator
Task/3777 hosting create vm calculator
|
2017-09-23 22:50:25 +05:30 |
|
PCoder
|
8781905fc6
|
Removed DataCenterLight PricingView
|
2017-09-23 21:24:42 +05:30 |
|
PCoder
|
b428a0933e
|
Deleted datacenterlight pricing.html
|
2017-09-23 21:23:48 +05:30 |
|
PCoder
|
83b52d95ae
|
Merge branch 'master' into task/3730/refactor_price_parameter
|
2017-09-23 21:18:54 +05:30 |
|
Arvind Tiwari
|
487af6e1c8
|
Update Changelog
|
2017-09-23 20:44:53 +05:30 |
|
Arvind Tiwari
|
61a1486ea4
|
Merge pull request #497 from tiwariav/bugfix/hosting_invoice_page
bugfix/hosting_invoice_page
|
2017-09-23 20:33:05 +05:30 |
|
Arvind Tiwari
|
e9721705ca
|
margin fix
|
2017-09-23 20:30:53 +05:30 |
|
Arvind Tiwari
|
2385c108e1
|
Merge pull request #491 from tiwariav/task/3786/hosting_invoice_page
Task/3786 order-details/invoice page redesign
|
2017-09-23 20:07:05 +05:30 |
|
Arvind Tiwari
|
3685bf591d
|
error msgs translation
|
2017-09-23 19:02:23 +05:30 |
|
Arvind Tiwari
|
be0c50aa2f
|
error msgs translation
|
2017-09-23 19:01:22 +05:30 |
|
PCoder
|
dec1f34250
|
Updated Changelog with pre-1.2.3 text
|
2017-09-23 17:17:24 +05:30 |
|
Pcoder
|
1b7da239e1
|
Merge pull request #492 from pcoder/feature/cms_prefix
Added /cms prefix for all the django-cms generated urls
|
2017-09-23 11:40:39 +00:00 |
|
PCoder
|
93d36306fb
|
Removed total and price fields used in dcl flow
|
2017-09-23 13:21:01 +05:30 |
|
PCoder
|
0bc2b22f62
|
Reformatted datacenterlight/tasks.py
|
2017-09-23 13:09:14 +05:30 |
|
PCoder
|
b17af3bb09
|
Merge branch 'task/3736/refactor_compute_vm_price' into task/3730/refactor_price_parameter
|
2017-09-23 12:48:31 +05:30 |
|
PCoder
|
8de4a75107
|
Removed some occurrences of price
|
2017-09-23 12:48:21 +05:30 |
|
PCoder
|
9ab7622a9c
|
Reformatted stripe_utils.py
|
2017-09-23 03:25:48 +05:30 |
|
PCoder
|
99e5cf5587
|
Using refactored get_vm_price and get_vm_plan_name functions
|
2017-09-23 03:18:05 +05:30 |
|
PCoder
|
285d664660
|
Refactored obtaining stripe plan name to utils.stripe_utils.get_stripe_plan_name
|
2017-09-23 03:17:21 +05:30 |
|
PCoder
|
3bb7f09d41
|
Refactored obtaining vm price to utils.hosting_utils.get_vm_price
|
2017-09-23 03:16:18 +05:30 |
|
PCoder
|
ea9e62db37
|
Reverted back django cms ckeditor migration module code
|
2017-09-23 01:55:21 +05:30 |
|
M.Ravi
|
c362dccd0f
|
Handling payment error response by json
|
2017-09-22 21:30:42 +02:00 |
|
M.Ravi
|
a48188a190
|
datacenterlight: Added create vm modal and responding with json
|
2017-09-22 21:20:00 +02:00 |
|
M.Ravi
|
ab66d25abe
|
Removed some commented code
|
2017-09-22 13:54:20 +02:00 |
|
M.Ravi
|
0e5a27862a
|
Added base_url and fixed new account emails
|
2017-09-22 13:46:22 +02:00 |
|
M.Ravi
|
ca73e1bb33
|
Fixed a logger message
|
2017-09-22 13:45:15 +02:00 |
|
M.Ravi
|
4c0c1ffb27
|
Do a user login after creation
|
2017-09-22 12:46:33 +02:00 |
|
M.Ravi
|
31f7c4a51a
|
Simplified code
|
2017-09-22 12:38:05 +02:00 |
|
M.Ravi
|
994ffaf117
|
Send account details in email
|
2017-09-22 12:01:09 +02:00 |
|
M.Ravi
|
f67b69d490
|
Formatted code and added condition to create user only if an email does not exist
|
2017-09-22 11:45:21 +02:00 |
|
M.Ravi
|
faa26a05dd
|
Reverted back some lines for preserving format
|
2017-09-22 08:51:35 +02:00 |
|
M.Ravi
|
2b0dbfa1e5
|
Added /cms prefix to django-cms urls
|
2017-09-22 08:47:42 +02:00 |
|
Arvind Tiwari
|
0993f2cab1
|
merged master
|
2017-09-21 19:43:20 +05:30 |
|
Arvind Tiwari
|
4a1596b093
|
merged master
|
2017-09-21 19:41:45 +05:30 |
|
Arvind Tiwari
|
6be245a811
|
merged master
|
2017-09-21 19:38:47 +05:30 |
|
Arvind Tiwari
|
1c0f0da96e
|
conditional texts
|
2017-09-21 19:32:22 +05:30 |
|
Arvind Tiwari
|
a16dbb50d8
|
design fixes
|
2017-09-21 19:17:10 +05:30 |
|
M.Ravi
|
e5ad57d3f1
|
Resolved some issues
|
2017-09-21 14:29:49 +02:00 |
|
Arvind Tiwari
|
db3955ab94
|
error 500 fixed
|
2017-09-21 17:45:12 +05:30 |
|
Arvind Tiwari
|
a792911dea
|
hosting view fix
|
2017-09-21 17:22:02 +05:30 |
|
Arvind Tiwari
|
5d8fb71215
|
removed redirects form get_context() to get()
|
2017-09-21 16:38:54 +05:30 |
|
Arvind Tiwari
|
2c4390767d
|
minor fixes
|
2017-09-21 15:14:15 +05:30 |
|