PCoder
|
39a2455817
|
Merged upstream master into task/3730/refactor_price_parameter
|
2017-09-24 04:20:41 +05:30 |
|
PCoder
|
9491bb81a2
|
Added missing import after merge
|
2017-09-24 02:03:48 +05:30 |
|
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 |
|
Arvind Tiwari
|
313b2b2f57
|
fixed vreate vm error
|
2017-09-23 23:47:25 +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
|
83b52d95ae
|
Merge branch 'master' into task/3730/refactor_price_parameter
|
2017-09-23 21:18:54 +05:30 |
|
Arvind Tiwari
|
e9721705ca
|
margin fix
|
2017-09-23 20:30:53 +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
|
99e5cf5587
|
Using refactored get_vm_price and get_vm_plan_name functions
|
2017-09-23 03:18:05 +05:30 |
|
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 |
|
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 |
|
Arvind Tiwari
|
6c381dd3fb
|
invoice page redesigned
|
2017-09-21 15:03:00 +05:30 |
|
Arvind Tiwari
|
6dfbf67d7d
|
rearranging text
|
2017-09-21 02:50:07 +05:30 |
|
PCoder
|
143f40bd2d
|
Merge branch 'task/3756/landing_billing_page' of https://github.com/tiwariav/dynamicweb into tiwariav-task/3756/landing_billing_page
|
2017-09-21 02:41:26 +05:30 |
|
Arvind Tiwari
|
1eff51099c
|
exception handling fix
|
2017-09-21 02:26:42 +05:30 |
|
Arvind Tiwari
|
dd77f40707
|
top options added
|
2017-09-21 02:23:08 +05:30 |
|
PCoder
|
2c2ee0f4a4
|
Some more translations
|
2017-09-21 02:18:39 +05:30 |
|
PCoder
|
3eeaba8715
|
Added some translations
|
2017-09-21 02:06:50 +05:30 |
|
Arvind Tiwari
|
f0e50a4e94
|
removed commented code
|
2017-09-21 01:20:51 +05:30 |
|
Arvind Tiwari
|
98eb2f85d8
|
printing pdf
|
2017-09-21 01:19:38 +05:30 |
|
Arvind Tiwari
|
0f5bf606da
|
minor fixes
|
2017-09-20 23:32:48 +05:30 |
|
Arvind Tiwari
|
ec354332f8
|
translation fix
|
2017-09-20 23:28:36 +05:30 |
|
Arvind Tiwari
|
65618bb2aa
|
merged master
|
2017-09-20 23:24:20 +05:30 |
|
Arvind Tiwari
|
fc03df4652
|
merged master
|
2017-09-20 23:21:24 +05:30 |
|
Arvind Tiwari
|
f4766c7d7c
|
merged master
|
2017-09-20 23:19:32 +05:30 |
|
Arvind Tiwari
|
37017dd31a
|
minor mods
|
2017-09-20 23:06:51 +05:30 |
|
Arvind Tiwari
|
98f094e5b8
|
initial changes
|
2017-09-19 15:03:06 +05:30 |
|
Arvind Tiwari
|
04126c69ee
|
vm name added
|
2017-09-19 14:34:53 +05:30 |
|
Arvind Tiwari
|
445359e1ed
|
modal restyle
|
2017-09-19 14:29:18 +05:30 |
|
Arvind Tiwari
|
c53c966136
|
success modal modification
|
2017-09-19 14:24:23 +05:30 |
|
Arvind Tiwari
|
4787276afe
|
bootstrap form input box-shadow removed
|
2017-09-19 13:54:27 +05:30 |
|
Arvind Tiwari
|
e893f1baf1
|
padding fix
|
2017-09-19 01:17:15 +05:30 |
|
Arvind Tiwari
|
3ef07758ef
|
translation and text fix
|
2017-09-19 01:08:27 +05:30 |
|
Arvind Tiwari
|
78423c83e3
|
removed error details from error msg
|
2017-09-19 00:59:51 +05:30 |
|
Arvind Tiwari
|
61bf158238
|
fix
|
2017-09-19 00:25:38 +05:30 |
|
Arvind Tiwari
|
8db7ead9e2
|
checking VM termination error
|
2017-09-19 00:24:06 +05:30 |
|
Arvind Tiwari
|
43300c7226
|
translations added, modal fixed
|
2017-09-18 23:21:04 +05:30 |
|
Arvind Tiwari
|
226f744bae
|
success modal added
|
2017-09-18 21:52:59 +05:30 |
|
Arvind Tiwari
|
b276194f31
|
width normalized
|
2017-09-18 20:18:02 +05:30 |
|
Arvind Tiwari
|
772469a23e
|
design modifications
|
2017-09-18 19:49:14 +05:30 |
|
PCoder
|
3fe6e65e84
|
Rearranged hold tight text
|
2017-09-16 21:45:21 +05:30 |
|
PCoder
|
0cf8e237b5
|
Now passing user's language to celery task
|
2017-09-16 20:55:37 +05:30 |
|
PCoder
|
acb739944b
|
Added sending email to user on create vm
|
2017-09-16 19:30:31 +05:30 |
|
PCoder
|
f2ee0ea657
|
Converting ugettext_lazy proxy to string
|
2017-09-16 17:54:05 +05:30 |
|
PCoder
|
c9fd741c89
|
Added encode method for ugettext_lazy strings
|
2017-09-16 17:22:37 +05:30 |
|
PCoder
|
40f13784ac
|
Reverted back to ugettext_lazy in hosting/views
|
2017-09-16 16:50:14 +05:30 |
|
PCoder
|
155a4b7cb6
|
Added translation and fa-times icon
|
2017-09-16 15:35:31 +05:30 |
|
M.Ravi
|
fe12b9e688
|
Added simple error handling case
|
2017-09-15 18:32:11 +02:00 |
|
M.Ravi
|
67f0e9068d
|
Fixed issue with multiline with template statement
|
2017-09-15 18:16:12 +02:00 |
|
M.Ravi
|
aab9464c6f
|
Rearranged order_detail.html
|
2017-09-15 18:11:22 +02:00 |
|
M.Ravi
|
fa6901e679
|
Made create vm modal non responsive to escape key press
|
2017-09-15 17:55:35 +02:00 |
|
M.Ravi
|
8c2fd03082
|
Now responding json HttpResponse for modal on vm create in hosting.
Important: Using ugettext instead of ugettext_lazy in hosting/views.py
|
2017-09-15 17:34:23 +02:00 |
|
M.Ravi
|
e14ed0c69f
|
Added js handling of create vm form submission
|
2017-09-15 17:30:38 +02:00 |
|
M.Ravi
|
ca5a99ccf5
|
Reverted autoformatted code
|
2017-09-15 17:29:41 +02:00 |
|
M.Ravi
|
445b8f4a79
|
Created virtual_machine_create_form and added ids for elements
|
2017-09-15 17:17:21 +02:00 |
|
Arvind Tiwari
|
2de0fc13b9
|
translation fix
|
2017-09-15 20:17:54 +05:30 |
|
Arvind Tiwari
|
556ed75262
|
translations
|
2017-09-15 20:14:32 +05:30 |
|
Arvind Tiwari
|
87327d028a
|
hosting form view modified
|
2017-09-15 20:03:52 +05:30 |
|
Arvind Tiwari
|
d49e90bd20
|
catching WrongIdError
|
2017-09-15 18:15:06 +05:30 |
|
Arvind Tiwari
|
9c0cefd419
|
js polling timing to 5s
|
2017-09-15 17:44:27 +05:30 |
|
Arvind Tiwari
|
bbb1919404
|
error msg fix
|
2017-09-15 17:38:52 +05:30 |
|
Arvind Tiwari
|
77f2454e3c
|
remove error msg on successful termination
|
2017-09-15 17:20:42 +05:30 |
|
Arvind Tiwari
|
0c3f605735
|
status pending style in vm-list
|
2017-09-15 17:02:02 +05:30 |
|
Arvind Tiwari
|
fdb5039c02
|
minor adjustments
|
2017-09-15 16:57:17 +05:30 |
|
Arvind Tiwari
|
6136a48961
|
edge cases handled
|
2017-09-15 16:46:56 +05:30 |
|
Arvind Tiwari
|
852c1228ba
|
minor fix
|
2017-09-15 14:48:11 +05:30 |
|
PCoder
|
589a4fcaa9
|
Added create vm modal
|
2017-09-15 12:45:11 +05:30 |
|
PCoder
|
805f1129e8
|
Merged upstream master into task/3772/hosting_billing_monthly_subscription
|
2017-09-15 03:34:50 +05:30 |
|
Arvind Tiwari
|
75156d2c00
|
undo changes in navbar
|
2017-09-15 01:00:07 +05:30 |
|
Arvind Tiwari
|
a935871722
|
code reformating
|
2017-09-15 00:57:59 +05:30 |
|
Arvind Tiwari
|
c2b5c62014
|
hosting calculator added
|
2017-09-15 00:49:39 +05:30 |
|
Arvind Tiwari
|
8402fd4fd3
|
merge master
|
2017-09-15 00:19:01 +05:30 |
|
Arvind Tiwari
|
a1a90ed5d0
|
while loop code formating
|
2017-09-15 00:14:09 +05:30 |
|
M.Ravi
|
5c3cf7682f
|
Fixed some flake8 warnings
|
2017-09-14 15:27:25 +02:00 |
|
M.Ravi
|
bd45577c90
|
Removed unwanted translations in hosting django.po
|
2017-09-14 14:28:52 +02:00 |
|
Arvind Tiwari
|
8393afe141
|
translations and test methods removed
|
2017-09-14 02:59:08 +05:30 |
|
Arvind Tiwari
|
e045caebbe
|
redirect on success
|
2017-09-14 02:52:37 +05:30 |
|
Arvind Tiwari
|
a808f3bf7e
|
error fix on termination
|
2017-09-14 02:48:56 +05:30 |
|
Arvind Tiwari
|
abc290de61
|
added error msg
|
2017-09-14 02:43:01 +05:30 |
|
Arvind Tiwari
|
8ca1b13f80
|
template fixed
|
2017-09-14 02:29:51 +05:30 |
|
Arvind Tiwari
|
07a464231d
|
animation added to vm termination
|
2017-09-14 02:24:10 +05:30 |
|
PCoder
|
face045090
|
Updated hosting django.po
|
2017-09-14 00:50:24 +05:30 |
|
M.Ravi
|
86ed0e5319
|
Removed code related removing keys from known_hosts
|
2017-09-13 14:32:33 +02:00 |
|
M.Ravi
|
a08104ba2c
|
Updated a comment
|
2017-09-13 14:31:13 +02:00 |
|
PCoder
|
d40403c15c
|
Updated hosting django.po
|
2017-09-13 07:31:22 +05:30 |
|
PCoder
|
d92e850f3e
|
Improved the condition of fetching key name
|
2017-09-13 07:03:49 +05:30 |
|
PCoder
|
01795dcad0
|
Verifying if a public key exists already
|
2017-09-13 06:57:15 +05:30 |
|
PCoder
|
94a5987985
|
Removed an unwanted print
|
2017-09-13 06:35:07 +05:30 |
|
PCoder
|
ee5150dc6e
|
strip instead of trim
|
2017-09-13 06:27:46 +05:30 |
|
PCoder
|
662219f524
|
Added trim function to clean public ssh key before validating and saving it
|
2017-09-13 06:07:12 +05:30 |
|
PCoder
|
612e11736e
|
Corrected obtaining values from vm_data dict
|
2017-09-13 05:37:26 +05:30 |
|
PCoder
|
f94ed011e5
|
Remove keys from known_hosts on delete of a vm
|
2017-09-13 05:30:05 +05:30 |
|
PCoder
|
221af96c8b
|
Removed explicit deleting of file with NamedTemporaryFile
|
2017-09-13 02:46:54 +05:30 |
|
PCoder
|
511a1551d5
|
Added logger debug message when file not found when deleting
|
2017-09-13 02:41:19 +05:30 |
|
PCoder
|
2983940d0f
|
Removed unwanted code
|
2017-09-13 02:33:21 +05:30 |
|
PCoder
|
3770489a49
|
Writing bytes to NamedTemporaryFile
|
2017-09-13 02:31:19 +05:30 |
|
PCoder
|
261615e701
|
Using ssh-keygen to validate public key
|
2017-09-13 02:22:29 +05:30 |
|
Arvind Tiwari
|
6237469ab2
|
mobile order fixed
|
2017-09-13 01:55:58 +05:30 |
|
PCoder
|
4ce914b178
|
Removed some code that was not used
|
2017-09-13 01:11:34 +05:30 |
|
PCoder
|
825a994979
|
Updated hosting django.po
|
2017-09-13 00:10:45 +05:30 |
|
PCoder
|
8c3544c0a4
|
Formatted code and added text - ending in
|
2017-09-13 00:01:10 +05:30 |
|
Arvind Tiwari
|
5f6f2e4ca9
|
added more translations
|
2017-09-11 23:52:30 +05:30 |
|
Arvind Tiwari
|
5d9a20dd94
|
merged master and added translations
|
2017-09-11 23:47:35 +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
|
1a43f4f810
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 20:30:50 +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
|
f9abdfe1bc
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 13:44:46 +05:30 |
|
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
|
d4e73f4c74
|
Merge branch 'master' into task/3756/landing_billing_page
|
2017-09-09 02:13:24 +05:30 |
|
Arvind Tiwari
|
7a4573f7ad
|
user logged in after signup on payment page
|
2017-09-09 02:10:25 +05:30 |
|
Arvind Tiwari
|
e9e72f4883
|
hosting navbar logo link fixed to dcl landing
|
2017-09-09 00:46:13 +05:30 |
|
Arvind Tiwari
|
de1895d2a0
|
billing address form fixed
|
2017-09-08 23:46:29 +05:30 |
|
Arvind Tiwari
|
daba6ae2fb
|
merged master
|
2017-09-08 20:22:22 +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 |
|
Arvind Tiwari
|
0ed104cd56
|
logged in user
|
2017-09-07 19:56:34 +05:30 |
|
M.Ravi
|
ec300a76eb
|
Handled some more errors that can be generated when creating SSHKey
|
2017-09-07 00:44:53 +02:00 |
|
M.Ravi
|
cf6bd8a7c1
|
Validating ssh public keys using sshpubkeys
|
2017-09-07 00:31:15 +02:00 |
|
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 |
|
Arvind Tiwari
|
db90ea8713
|
new translations
|
2017-09-07 02:51:07 +05:30 |
|