M.Ravi
564f47cf8a
Handle login and billing address forms together in PaymentOrderView
2017-10-08 13:50:43 +02:00
Arvind Tiwari
25e3980b20
pattern.jpg compressed
2017-10-07 23:33:08 +05:30
M.Ravi
02d144fbf9
Add form name and error fields to payment login form
2017-10-07 12:59:40 +02:00
Arvind Tiwari
7d7b8661ea
translations
2017-10-07 16:19:53 +05:30
Arvind Tiwari
769396d95e
login pages restyled and footer included
2017-10-07 14:38:48 +05:30
Arvind Tiwari
1990c4758e
merged master
2017-10-03 23:49:26 +05:30
Arvind Tiwari
6802e2fdbc
merged master
2017-10-03 18:54:47 +05:30
Arvind Tiwari
e4837b063c
alignment fix
2017-10-03 18:18:18 +05:30
M.Ravi
60b233f082
Fix flake8 warnings
2017-10-03 00:26:50 +02:00
M.Ravi
42224a5d38
Add missing form ids
2017-10-02 01:34:32 +02:00
M.Ravi
a605901850
Update datacenterlight django.po
2017-10-02 00:15:13 +02:00
M.Ravi
22af001489
Merge upstream master
2017-10-02 00:09:38 +02:00
M.Ravi
4bf73db14f
Update datacenterlight django.po
2017-09-29 22:01:28 +02:00
M.Ravi
5bbfb54b79
Revert back to simple error message
2017-09-29 21:54:31 +02:00
M.Ravi
5393ffa10d
Small code reorganizing
2017-09-29 09:16:00 +02:00
M.Ravi
d06f5ffb00
datacenterlight/views: remove billing_address_id in call to
...
create_vm_task
2017-09-29 08:58:45 +02:00
M.Ravi
61a4060e10
datacenterlight/tests: remove billing_address_id in call to
...
create_vm_task
2017-09-29 08:55:30 +02:00
M.Ravi
483aa493bb
Remove billing_address_id as it is no more used
2017-09-29 08:51:58 +02:00
M.Ravi
caad79304b
Pass subscription_id instead of subscription object
2017-09-29 08:40:43 +02:00
M.Ravi
f29a3ad0e6
Pass subscription_id to create_vm_task instead of the object
2017-09-29 08:39:20 +02:00
M.Ravi
5783e42171
Refactor code and add following fixes
...
- create_vm_task receiving stripe_subscription_id instead of object
- Fix: use BillingAddress instead of UserBillingAddress in
HostingOrder, HostingPlan
- Remove DictDotLookup class
2017-09-29 08:37:25 +02:00
M.Ravi
f60a2c3482
Make correct icons load on dcl createvm error modal
2017-09-28 23:20:43 +02:00
M.Ravi
0202d5ba93
Add initial values for dcl billing form
2017-09-28 22:56:33 +02:00
PCoder
fcda0b5637
DCL payment page: Get form data from session on error
2017-09-29 01:25:22 +05:30
M.Ravi
c13015eabd
Refactor and correct some logic
2017-09-28 15:56:09 +02:00
Arvind Tiwari
519a74e834
logo update
2017-09-28 19:08:25 +05:30
Arvind Tiwari
ba366eed77
merge master
2017-09-28 18:37:33 +05:30
M.Ravi
57f0757fa3
Update datacenterlight django.po
2017-09-28 15:00:44 +02:00
Arvind Tiwari
abb7c38d75
translation fix
2017-09-28 18:27:26 +05:30
M.Ravi
46925c29c4
Add error detail to the message
2017-09-28 14:57:03 +02:00
Arvind Tiwari
b65bc3f1f5
merge master
2017-09-28 18:23:48 +05:30
M.Ravi
07aaa20efe
Fix issue : stripe user created every time for unauthenticated user
2017-09-28 14:46:56 +02:00
PCoder
39cb930326
Compute vm price on post of dcl index and set in session
2017-09-28 04:22:15 +05:30
PCoder
e215a85a4d
dcl order confirmation: add code to show button on modal
2017-09-28 04:14:35 +05:30
PCoder
fccd75f1fc
Add missing imports
2017-09-28 03:46:05 +05:30
PCoder
06ef940b01
Merge upstream
2017-09-28 03:33:43 +05:30
Arvind Tiwari
f0a49ef075
translations
2017-09-28 03:12:03 +05:30
Arvind Tiwari
88706b0088
merged master
2017-09-28 03:06:47 +05:30
PCoder
5a2a134070
Merge upstream master
2017-09-28 01:35:09 +05:30
PCoder
3bc82907a9
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
2017-09-28 01:14:37 +05:30
Arvind Tiwari
11c1781839
fix for gmail autoformatiing
2017-09-27 04:37:02 +05:30
Arvind Tiwari
313b32e098
vm name bold in email
2017-09-27 04:24:22 +05:30
Arvind Tiwari
06bc37a977
paddings changed
2017-09-27 04:13:04 +05:30
Arvind Tiwari
96f24881fe
vm name fix
2017-09-27 03:36:02 +05:30
Arvind Tiwari
f4b6b38522
minor fix
2017-09-27 03:28:06 +05:30
Arvind Tiwari
5747468c21
outline removed
2017-09-27 03:09:43 +05:30
Arvind Tiwari
2d06173edb
logo padding
2017-09-27 02:50:59 +05:30
Arvind Tiwari
8307636b9b
Merge branch 'master' into task/3794/update_email_styles
2017-09-27 02:16:09 +05:30
Arvind Tiwari
03b4ff1b65
png logo
2017-09-27 02:14:45 +05:30
Arvind Tiwari
d3f2fd2aa0
dcl logo changed to png
2017-09-27 02:14:20 +05:30
Arvind Tiwari
21660f8d00
font-size reduced, vm cancel and vm create email data fixed
2017-09-27 02:07:52 +05:30
Arvind Tiwari
2a99d053dc
text fixes
2017-09-26 03:42:10 +05:30
Arvind Tiwari
3cf28c793c
form method fix
2017-09-26 03:29:38 +05:30
Arvind Tiwari
dfbda2a53b
load tag
2017-09-26 03:21:20 +05:30
Arvind Tiwari
3c32abbf8e
dcl form added
2017-09-26 03:18:19 +05:30
Arvind Tiwari
050f750322
merged master
2017-09-26 03:06:12 +05:30
Arvind Tiwari
a37c734c94
translation fix
2017-09-26 02:53:09 +05:30
Arvind Tiwari
f35c3dbc10
modal check icon thinner, terminate modal text smaller
2017-09-26 02:38:31 +05:30
Arvind Tiwari
63ea7dac37
datacenterlight invoice redesigned
2017-09-26 01:04:38 +05:30
PCoder
114511e924
Fixed some flake8 warnings
2017-09-25 00:34:18 +05:30
PCoder
7278a20135
Added get_or_create_vm_detail function
2017-09-25 00:02:36 +05:30
PCoder
03a565b4d0
Corrected a small de text füll->fülle
2017-09-24 04:44:20 +05:30
PCoder
39a2455817
Merged upstream master into task/3730/refactor_price_parameter
2017-09-24 04:20:41 +05:30
PCoder
c6c5a20a17
Updated datacenterlight django.po
2017-09-24 03:06:05 +05:30
PCoder
656e7563fd
Merged upstream master into tiwariav-task/3756/landing_billing_page
2017-09-24 01:31:57 +05:30
PCoder
537e350c8c
Redirecting users on creation of accounts to my virtual machines page
2017-09-24 00:22:18 +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
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
99e5cf5587
Using refactored get_vm_price and get_vm_plan_name functions
2017-09-23 03:18:05 +05:30
Arvind Tiwari
6983b6f72e
all emails redesigned
2017-09-23 02:27:19 +05:30
Arvind Tiwari
057a2c77a6
password reset email, user activation email redesigned
2017-09-23 01:57:40 +05:30
Arvind Tiwari
29fb7224a6
new translations
2017-09-23 01:08:09 +05:30
Arvind Tiwari
6004a7ede4
new welcome email
2017-09-23 01:03:43 +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
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
e5ad57d3f1
Resolved some issues
2017-09-21 14:29:49 +02:00
PCoder
e2cb70a697
first attempt at refatoring the user creating to order confirmaton page
2017-09-21 06:41:09 +05:30
Arvind Tiwari
f0e50a4e94
removed commented code
2017-09-21 01:20:51 +05:30
Arvind Tiwari
0f5bf606da
minor fixes
2017-09-20 23:32:48 +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
772469a23e
design modifications
2017-09-18 19:49:14 +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
7256160a7b
Merge branch 'master' into task/3772/hosting_billing_monthly_subscription
2017-09-16 14:45:34 +05:30
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
M.Ravi
a06753ca4b
Use hostname and send celery errors to DCL_ERROR_EMAILS_TO
2017-09-15 13:09:46 +02:00
M.Ravi
2731ea8635
Fixed getting custom_user when calling create_vm for hosting
2017-09-15 11:32:20 +02:00
PCoder
0561688f84
Add ssh keys on creation of new VM
2017-09-15 12:43:48 +05:30
PCoder
805f1129e8
Merged upstream master into task/3772/hosting_billing_monthly_subscription
2017-09-15 03:34:50 +05:30
M.Ravi
5c3cf7682f
Fixed some flake8 warnings
2017-09-14 15:27:25 +02:00
Arvind Tiwari
787ff6b6d3
mixxing translation
2017-09-13 01:58:40 +05:30
Arvind Tiwari
6237469ab2
mobile order fixed
2017-09-13 01:55:58 +05:30
Arvind Tiwari
4d2903ca86
billing address save and get
2017-09-12 00:54:02 +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
38a8997e29
Refactored code
2017-09-10 15:26:29 +05:30
PCoder
56a8ad2edf
Changed VM name format for create vm when user is already logged in
2017-09-10 14:52:06 +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
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
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
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
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
f2a04c20f2
form submit fix
2017-09-09 00:05:13 +05:30
Arvind Tiwari
2dc9ce4d31
vm specs fixed
2017-09-08 23:53:32 +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
5c543af25c
code cleanup
2017-09-08 20:14:43 +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
4937baa2e0
dropdown style updated
2017-09-08 02:22:03 +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
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
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
Arvind Tiwari
0ed104cd56
logged in user
2017-09-07 19:56:34 +05:30
Arvind Tiwari
114b4bea48
new translations
2017-09-07 02:52:25 +05:30
Arvind Tiwari
98e8be1da9
landing payment page layout complete
2017-09-07 02:47:57 +05:30
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
Arvind Tiwari
aaf3bc18d8
landing_payment all sections arranged
2017-09-06 00:12:13 +05:30
Arvind Tiwari
09b80467b9
landing payment page cleanup
2017-09-05 00:24:18 +05:30
Arvind Tiwari
046b716091
Merge branch 'master' into task/3756/landing_billing_page
2017-09-04 23:58:22 +05:30
M.Ravi
a98832c6d3
Fixed datacenterlight django.po
2017-09-03 18:49:28 +02:00
M.Ravi
7a4e0760ae
Updated account activation txt email template
2017-09-03 18:47:42 +02:00
PCoder
3b444b38b1
Regenerated dcl django.po
2017-09-02 16:53:49 +05:30
PCoder
5381e0fa67
Fixed another incorrect template
2017-09-02 14:30:10 +05:30
PCoder
ede949004e
Fixed an incorrect template name
2017-09-02 14:28:18 +05:30
PCoder
61988ae27b
Renamed base_email to base_email_datacenterlight
2017-09-02 14:24:23 +05:30
PCoder
cf83a67d51
Further refactored to base_email_datacenterlight.html
2017-09-02 14:17:08 +05:30
