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
PCoder
75611deadd
Further refactored user activation email
2017-09-02 13:32:20 +05:30
PCoder
eb79251fc0
Added translation and refactored user activation txt email
2017-09-02 13:25:47 +05:30
PCoder
aecdff2ab7
Made into a single text -- Your Data Center Light Team
2017-09-02 12:47:44 +05:30
PCoder
f4726954b8
Removed Raleway font
2017-09-02 12:35:01 +05:30
PCoder
79f4b38e4c
Refactored user activation email
2017-09-02 12:24:10 +05:30
PCoder
39b996ea1a
Merge branch 'task/3318/mail_style_fix' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3318/mail_style_fix
2017-09-02 11:03:05 +05:30
Arvind Tiwari
f0bca697b1
fix
2017-09-02 03:20:32 +05:30
Arvind Tiwari
95f4cb3753
fix
2017-09-02 03:14:02 +05:30
Arvind Tiwari
b9f0a886e0
translation fixes
2017-09-02 03:09:02 +05:30
Arvind Tiwari
e524281d16
Merge pull request #466 from pcoder/task/3709/faq_tos_cms_template
...
Task/3709/Improvements to Data Center Light CMS template
2017-09-02 02:27:46 +05:30
Arvind Tiwari
979844e55b
hosting payment and datacenterlight payment files supported
2017-09-02 02:02:05 +05:30
Arvind Tiwari
cc5eaa4047
new template for datacenterlight/payment
2017-09-01 23:06:57 +05:30
Arvind Tiwari
03a96f5457
Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
...
Task/3678 remove lato font files
2017-09-01 22:53:52 +05:30
Arvind Tiwari
ffa0abee34
contact link fix
2017-09-01 02:16:18 +05:30
Arvind Tiwari
b1baf564db
navbar-header clickable, contact href fixed, highlights focus color fixed
2017-09-01 02:05:24 +05:30
Arvind Tiwari
fa538e7747
landing buttons fixed
2017-09-01 01:32:06 +05:30
Arvind Tiwari
5550867870
navbar link hash fixed, footer links fixed
2017-09-01 01:27:44 +05:30
Arvind Tiwari
3ed2399337
merge master
2017-09-01 00:39:01 +05:30
Arvind Tiwari
e94f9a5d2b
dropdown style fix
2017-08-31 23:42:18 +05:30
Arvind Tiwari
d1f5ead9a0
place order msg posiotion fixed for mobile
2017-08-31 21:26:39 +05:30
PCoder
51190a5546
Added page_title in the title tag and the page title text
2017-08-31 00:36:19 +05:30
PCoder
a7b1819d04
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-31 00:10:02 +05:30
M.Ravi
5ffb2a2bb7
Improved the contact us email message subject & reformatted code
2017-08-30 10:04:19 +02:00
PCoder
657f64d7b9
Merged latest master into task/3757/add_new_routes_to_dcl
2017-08-30 00:32:31 +05:30
M.Ravi
12bb95f685
Fixed a mistake
2017-08-29 10:46:16 +02:00
M.Ravi
2f2dcb0814
Added datacenterlight/t, datacenterlight/g, datacenterlight/f
...
url routes to point to dcl's IndexView
2017-08-29 10:43:30 +02:00
PCoder
1da04a05d1
Created send_plain_email_task celery task and calling it on contact send
2017-08-27 16:42:14 +05:30
PCoder
d69dbcb720
Cleaned up some comment code
2017-08-27 16:42:14 +05:30
PCoder
7c9ec6fdde
Added contact us migrations after --merge with the existing migrations
2017-08-27 16:42:14 +05:30
PCoder
28bcef082c
Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message
2017-08-27 16:41:39 +05:30
PCoder
6cca92ec3a
Reformatted dcl's _navbar.html.
...
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
2017-08-27 16:37:49 +05:30
M.Ravi
b044acab5d
Refactored class names to better names
2017-08-27 16:37:49 +05:30
M.Ravi
597541a2ee
Updated _navbar to show menu on other pages except for index and whydcl
2017-08-27 16:37:49 +05:30
M.Ravi
8caeaf0217
Added cms.css and renamed faq.html to cms_page.html
2017-08-27 16:37:48 +05:30
PCoder
189adbadfb
Added cms_tags, sekizai_tags and cms_toolbar
2017-08-27 16:37:48 +05:30
PCoder
cd67bb9938
Added faq.html cms template
2017-08-27 16:37:48 +05:30
PCoder
6c1307d1d3
Reverted back to original title in base.html
2017-08-26 21:01:21 +05:30
PCoder
af713a0e96
cms_page.html: Added placeholder for title tag
2017-08-26 20:49:17 +05:30
PCoder
0be3266ed3
Moved cms toolbar before title tag
2017-08-26 20:46:51 +05:30
PCoder
2a76167d10
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-24 23:59:09 +05:30
M.Ravi
7153b635e5
Removed (incl. VAT) text in hosting,dcl payment template
2017-08-24 13:29:39 +02:00
M.Ravi
60df9a888c
Added translation for month
2017-08-24 12:48:30 +02:00
PCoder
f2b0ff04ca
Added text and styles for monthly payment clarification
2017-08-24 13:41:48 +05:30
PCoder
eab0c9fac1
Added price to specs as it is being used in create_vm_task
2017-08-24 12:30:17 +05:30
PCoder
16f000c723
dcl views.py: passing cc details to create_vm_task + reformatted code
2017-08-24 11:54:12 +05:30
PCoder
3111255673
Updated test_create_vm_task for monthly subscriptions
2017-08-24 11:50:43 +05:30
PCoder
0256b0bf03
Added credit card details as param for create_vm_task
2017-08-24 11:49:41 +05:30
PCoder
a964f2fb5b
Merged master into task/3701/enable_monthly_payments
2017-08-24 04:06:48 +05:30
PCoder
6484684ac5
Removed unncessary check for error for make_charge
2017-08-24 02:29:24 +05:30
M.Ravi
0846718893
Rearranged imports
2017-08-23 20:16:27 +02:00
M.Ravi
82b73df6e7
Added test case to check whether celery task executes properly on production.
2017-08-23 20:12:50 +02:00
PCoder
487ab6b927
Changed the subscription plan id field size to 256 characters
2017-08-22 01:55:45 +05:30
PCoder
83df42b5df
Fixed checking active status of subscription + redirection to payment page on error
2017-08-22 00:07:58 +05:30
Arvind Tiwari
a0d5b4d04f
removed Lato font files from web server, and its usage from css files
2017-08-21 23:35:17 +05:30
PCoder
6c80f94f67
Reformatted dcl's _navbar.html.
...
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
2017-08-21 23:16:55 +05:30
M.Ravi
6339442bfe
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-21 18:01:28 +02:00
M.Ravi
696af58bff
Refactored class names to better names
2017-08-21 18:00:41 +02:00
M.Ravi
c8dcd65adc
Updated _navbar to show menu on other pages except for index and whydcl
2017-08-21 17:52:57 +02:00
M.Ravi
090f338878
Added cms.css and renamed faq.html to cms_page.html
2017-08-21 17:51:38 +02:00
PCoder
506b5a904a
Added missing code from the merge
2017-08-21 01:54:55 +05:30
PCoder
7def893028
Merged origin/master into task/3701/enable_monthly_payments
2017-08-21 00:27:44 +05:30
PCoder
ddbaf902af
Removed __future__ datacenterlight/tasks
2017-08-20 20:23:59 +05:30
Arvind Tiwari
06c68873ae
downtime.html modified as a static html page
2017-08-20 03:59:24 +05:30
Arvind Tiwari
0e72f8a436
downtime page
2017-08-20 03:30:10 +05:30
Arvind Tiwari
65ac2df002
dropdown style changed to match landing page style
2017-08-20 01:46:26 +05:30
PCoder
69f5aea560
Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow
2017-08-20 01:39:12 +05:30
PCoder
bc43d9225a
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-20 01:37:54 +05:30
PCoder
9a0592ec4b
Merge branch 'master' into task/3701/enable_monthly_payments
2017-08-20 01:36:45 +05:30
Arvind Tiwari
6764e1ccee
Merge pull request #441 from tiwariav/task/3565/warning-color
...
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
2017-08-20 00:29:21 +05:30
PCoder
2b71795431
Added missing oneadmin's ssh key statement
2017-08-19 18:02:55 +05:30
PCoder
687cf96287
Added cms_tags, sekizai_tags and cms_toolbar
2017-08-19 06:39:56 +05:30
PCoder
17fbaa59be
Added faq.html cms template
2017-08-19 06:37:40 +05:30
PCoder
339a6283cd
Removed unused imports
2017-08-19 03:32:30 +05:30
PCoder
6b7ae88f74
Merged master into task/3622/decouple_opennebula_dcl_flow
2017-08-19 03:24:22 +05:30
PCoder
fc70c30f21
Merged master into task/3701/enable_monthly_payments
2017-08-18 00:40:57 +05:30
Pcoder
a80b0668a2
Merge pull request #432 from siarheipuhach/feature/task3637
...
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
M.Ravi
fcaa5e31dd
Added condition that the status should be 'active' for new subscription
2017-08-17 18:31:27 +02:00
M.Ravi
171a463261
Updated dcl views.py to create subscriptions instead of one time charge
2017-08-17 18:24:10 +02:00
PCoder
1a2b0e4e29
Added datacenterlight/migrations/0007_stripeplan.py migration file
2017-08-17 04:26:04 +05:30
PCoder
fc1ddbdd3b
Added StripePlan model
2017-08-17 04:22:23 +05:30
PCoder
73721f16d2
Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow
2017-08-15 02:29:01 +05:30
ARvind Tiwari
7cf46ad8b8
override bootstrap default danger color #a94442 -> #eb4d5c
2017-08-09 00:21:25 +05:30
ARvind Tiwari
451f2a141e
file reformated
2017-08-08 22:46:00 +05:30
ARvind Tiwari
6c4e0067ba
font-family changed to 'Lato' in all css files
2017-08-08 00:35:58 +05:30
ARvind Tiwari
5cea467deb
master merged
2017-08-07 22:23:51 +05:30
Siarhei Puhach
72ddfd96ab
Payment error was unified
2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566
Added error hash in url, added payment error handler to hosting/views
2017-08-07 17:02:47 +03:00
Siarhei Puhach
4cd3d6a4aa
Added stripe make_charge error handler
2017-08-07 13:36:21 +03:00
M.Ravi
29b28d551c
Fixed flake8 lint warnings
2017-08-06 22:19:27 +02:00
M.Ravi
58bb754814
Introduced MaxRetries and MaxRetriesExceededError handling code
2017-08-06 21:54:12 +02:00
M.Ravi
e7864f5d85
Added condition to check if create_vm succeeded
2017-08-06 18:52:28 +02:00
M.Ravi
f950c1defb
Added datacenterlight/tasks.py
2017-08-06 18:42:27 +02:00
M.Ravi
bd2edf599a
Merged views from master
2017-08-06 15:08:05 +02:00
M.Ravi
3ad5928aa0
A working version of celery create_vm_task added
2017-08-06 14:33:55 +02:00
Pcoder
90f01c277b
Merge pull request #436 from tiwariav/task/3660/webringfuture
...
task #3660 whydatacenterlight 'we bring future' section
2017-08-04 21:02:53 +02:00
Pcoder
5f71b19fb1
Merge pull request #429 from amarynets/bugfix/add_vmtemplate_mig_file
...
Add file with VMTemplate hosting migrations
2017-08-04 19:44:34 +02:00
ARvind Tiwari
d93942fa0b
heading sizes changed
2017-08-04 18:32:34 +05:30
ARvind Tiwari
6cef45beee
lead line break and alignment fixed
2017-08-04 17:20:53 +05:30
Siarhei Puhach
657e97fc6d
Merge branch 'master' into feature/task3637
2017-08-04 11:05:37 +03:00
Siarhei Puhach
29fb771afb
Changed payment error place, changed message source to Stripe errors handler
2017-08-04 11:01:32 +03:00
PCoder
94bc552f75
Resolved conflicts
2017-08-04 03:25:47 +05:30
Pcoder
3d051aee14
Merge pull request #428 from tiwariav/task/3620/ssh_keys
...
task/3620 ssh_keys_choice page new design
2017-08-03 22:53:12 +02:00
ARvind Tiwari
9d37e3f58c
views fix
2017-08-04 00:58:54 +05:30
ARvind Tiwari
8edbd29fad
navbar made white, dropdown fix
2017-08-03 23:18:58 +05:30
ARvind Tiwari
0993d8c106
reviewed changes
2017-08-03 22:00:41 +05:30
Siarhei Puhach
34acf2310b
Added stripe failed payment error handler
2017-08-03 12:47:34 +03:00
ARvind Tiwari
3081786f0b
merged master, conflict resolved
2017-08-03 03:27:46 +05:30
ARvind Tiwari
fda20eacd6
translation fix and font-weight bold
2017-08-03 03:12:40 +05:30
ARvind Tiwari
a3d5c81530
navbar fixed on payment, order-success, order-confirmation
2017-08-03 02:35:44 +05:30
Pcoder
4d33837069
Merge pull request #420 from tiwariav/task/3553
...
why datacenterlight page, 'we bring the future' section layout
2017-08-02 22:57:00 +02:00
Andrii Marynets
e13d802f28
Add file with VMTemplate hosting migrations
2017-08-02 23:40:00 +03:00
PCoder
9c2c5ba56a
Changed Preis -> Preise in the Whydatacenterlight footer
2017-08-01 00:55:35 +05:30
PCoder
c1409d5ca1
Improved validation error message texts and their DE translations
2017-08-01 00:01:19 +05:30
ARvind Tiwari
8aac161196
Merge branch 'master' into task/3354/modal_restyling
2017-07-31 20:17:17 +05:30
ARvind Tiwari
a2f705f012
Merge branch 'master' into feature/3517/ssh_keys
2017-07-31 18:50:07 +05:30
ARvind Tiwari
f4880ae136
font weight bold for titles
2017-07-31 18:44:13 +05:30
ARvind Tiwari
e6208ee639
font size to 32px
2017-07-31 18:19:09 +05:30
ARvind Tiwari
bb061c67d0
Merge branch 'master' into task/3553
2017-07-31 18:17:30 +05:30
ARvind Tiwari
6b77d2eaff
Merge branch 'master' into task/3553
2017-07-31 18:14:02 +05:30
ARvind Tiwari
aa4bfbdd31
font size reduced for mobile
2017-07-31 17:56:03 +05:30
PCoder
dc5d45d674
Added trans tag to All rights reserved
2017-07-31 01:00:43 +05:30
PCoder
98d0409219
Updated dcl .po, added DE translation for All rights reserved
2017-07-31 00:59:33 +05:30
ARvind Tiwari
6c63797e7c
merged PR #413
2017-07-29 18:51:13 +05:30
ARvind Tiwari
391d123f31
nav js modified
2017-07-29 18:37:56 +05:30
Pcoder
abbb217848
Merge pull request #404 from amarynets/bugfix/warning_messages
...
Fix warning messages and deprecated url #3542
2017-07-28 22:26:32 +02:00
ARvind Tiwari
10108f7d93
merged master
2017-07-28 17:45:38 +05:30
ARvind Tiwari
4995604873
minor padding adjustments
2017-07-28 17:39:20 +05:30
ARvind Tiwari
d6b3ee5e09
merged master
2017-07-28 17:12:14 +05:30
ARvind Tiwari
9bd9ec5971
merged master
2017-07-28 16:48:50 +05:30
ARvind Tiwari
925252f1c9
merged master
2017-07-28 16:45:34 +05:30
Arvind Tiwari
2724cbd375
merged from master
2017-07-28 16:43:03 +05:30
Pcoder
53fc982837
Merge pull request #418 from pcoder/task/3615/decouple_landing_page_from_opennebula
...
Task/3615/decouple landing page from opennebula
2017-07-27 23:34:49 +02:00
Pcoder
cb4d827f0b
Merge pull request #417 from ungleich/siarheipuhach-task3577
...
Siarheipuhach task3577
Added backend cpu, ram, ssd fields validation.
2017-07-27 22:39:44 +02:00
Pcoder
8dd1cbda19
Merge pull request #415 from tiwariav/bugfix/3553/navbar
...
Task #3553 fix page "blinks" on click on navbar link
2017-07-27 21:55:27 +02:00
Pcoder
deee202d04
Update main.js
...
Added a terminator
2017-07-28 01:04:23 +05:30
Pcoder
3c4ca1101a
Update main.js
...
Fixed probably a typo. 500 -> 2000 for storage.
2017-07-28 01:02:45 +05:30
ARvind Tiwari
33c56b8890
why datacenterlight page, 'we bring the future' section layout changed to flex and mobile layout fixed
2017-07-27 18:35:17 +05:30
ARvind Tiwari
08155c379b
Merge branch 'master' into task/3354/modal_restyling
2017-07-27 16:02:39 +05:30
ARvind Tiwari
035266b68b
main.js indent changed back to 4 spaces
2017-07-27 15:50:44 +05:30
PCoder
fca291c6a5
Added VMTemplateSerializer
2017-07-27 12:05:01 +05:30
PCoder
1a6e497e38
Removed another openebula call after submitting landing page calculator
2017-07-27 11:25:48 +05:30
M.Ravi
8485819caa
Removed unneeded code from datacenterlight/views.py
2017-07-26 20:58:08 +02:00
M.Ravi
1f58da70d4
Removed OpenNebula code from the IndexView and code reformatted
2017-07-26 20:39:51 +02:00
M.Ravi
f3cfe19e68
Reformatted the template file and used opennebula_vm_template_id instead of template_id
2017-07-26 20:38:53 +02:00
M.Ravi
71e4fece58
Renamed opennebula_vm_id to opennebula_vm_template_id
2017-07-26 20:35:12 +02:00
M.Ravi
762c8b14cc
Added fetchvmtemplates management command in datacenterlight
2017-07-26 19:52:02 +02:00
M.Ravi
c92960a3e6
Added VMTemplate model
2017-07-26 19:38:38 +02:00
ARvind Tiwari
b9873c2829
changed font name to 'Lato' from 'Lato-Regular' in landing-page.css
2017-07-26 17:07:12 +05:30
ARvind Tiwari
2c7a42e447
removed class url from <a> tags which redirect to other page
2017-07-26 16:54:49 +05:30
PCoder
9883a3f908
Refactored the validation error messages
2017-07-26 01:55:31 +05:30
PCoder
fff468f95f
Merge branch 'task3577' of https://github.com/siarheipuhach/dynamicweb into siarheipuhach-task3577
2017-07-26 01:30:24 +05:30
Pcoder
a05b5b6918
Merge pull request #412 from amarynets/bugfix/change_text_on_button
...
Change text on button Order now -> Continue!
2017-07-25 20:36:13 +02:00
ARvind Tiwari
8e1a5a0221
added back href to links, removed blinking
2017-07-25 19:44:19 +05:30
ARvind Tiwari
0e4a488dc1
footer links :hover :fpcus :active color changed to #ddd
2017-07-25 18:59:07 +05:30
ARvind Tiwari
1e55c6679a
removed the language dropdown, replaced with link to the only other language
2017-07-25 18:17:59 +05:30
ARvind Tiwari
7319cc4e1d
language options using bootstrap dropdown
2017-07-24 22:16:37 +05:30
Andrii Marynets
0db218cfbf
Change text on button Order now!
2017-07-24 18:52:28 +03:00
ARvind Tiwari
918e13bf91
modal close button thinner, some icons changed, vertical alignment changed to middle
2017-07-24 18:52:23 +05:30
ARvind Tiwari
c26e9a692a
social icons underbars removed
2017-07-21 21:10:33 +05:30
Polycarp Okock
032059c965
Merge branch 'master' into bugfix/#3553-2
2017-07-20 23:30:04 +03:00
Polycarp Okock
2c422c49f6
Merge pull request #395 from macs03/bugfix/#3558
...
Task #3558 header change
2017-07-20 22:22:54 +03:00
Andrii Marynets
72ece2ec29
Merge branch 'master' into bugfix/hover_on_mobile_device_#3588
2017-07-20 22:17:58 +03:00
Polycarp Okock
39b06775a7
Merge pull request #399 from pcoder/task/3581/change_font_weight
...
Added font-weight-> 300 to .split-section .split-text .lead in dcl
2017-07-20 22:14:01 +03:00
Andrii Marynets
884fd6cda1
Fix :hover on mobile device
2017-07-20 22:10:09 +03:00
Miguel Cardenas
38413820be
font family late light for titles
2017-07-20 11:13:08 -05:00
Polycarp Okock
7a8154a907
Updated Views
...
Added the cardholder_name as one of the fields retrieved from the Payment page
2017-07-20 15:02:59 +03:00
Polycarp Okock
50f7227b10
Updated Order_detail
...
Added the tag to load the Card holder name entered from the billing address
2017-07-20 15:00:14 +03:00
PCoder
bc10cf5e41
Set font size to 21px to all new-lead elements
2017-07-19 02:44:40 +05:30
Andrii Marynets
00a0946936
Fix url warning in datacenterlight
2017-07-18 23:09:02 +03:00
PCoder
af46927b9d
Changed the font weight of the lead text to 300
2017-07-18 01:35:33 +05:30
PCoder
f4aec68bfd
Added style to right align date in desktop view in Order Confirm page
2017-07-18 00:30:32 +05:30
PCoder
c938af51a5
Added font-weight-> 300 to .split-section .split-text .lead in dcl landing-page.css
2017-07-17 03:16:23 +05:30
PCoder
3f6250862b
Changed text align left to the date in the order_detail.html both in dcl and hosting
2017-07-17 02:57:24 +05:30
PCoder
ec4b47ccb6
Fixed overlapping issue of date and billing address in dcl order_detail.html
2017-07-17 02:50:59 +05:30
Siarhei Puhach
b30f41219c
Added backend cpu,ram,ssd fields validation
2017-07-14 11:34:40 +03:00
Miguel Cardenas
aa7856ebc0
change color of header
2017-07-13 18:26:14 -05:00
Miguel Cardenas
626598d8c5
fix indentation to 4 spaces
2017-07-13 16:49:52 -05:00
Miguel Cardenas
407b3f0a8c
Merge branch 'master' into bugfix/#3553-2
2017-07-13 14:30:06 -05:00
PCoder
c7a99b4ad2
Added periods to german validation texts
2017-07-14 00:04:20 +05:30
PCoder
270354b22d
Removed some fuzzy translations
2017-07-14 00:02:35 +05:30
PCoder
b4e943849c
Added DE translations and periods for all validation texts
2017-07-13 23:58:54 +05:30
Miguel Cardenas
df55757be3
Change font family for header
2017-07-13 12:04:05 -05:00
Siarhei Puhach
d727e64b93
Update landing-page.css
2017-07-13 15:06:18 +03:00
Siarhei Puhach
2ad62daa10
Update landing-page.css
2017-07-13 14:53:43 +03:00
Siarhei Puhach
290bfe272f
Changed field error messages, made fields wider
2017-07-13 12:59:05 +03:00
Miguel Cardenas
696221acb5
add cursor pointer
2017-07-11 20:16:34 -05:00
Miguel Cardenas
fa277af33f
prevent blink after click of menu elements
2017-07-11 20:04:32 -05:00
PCoder
8980c7deb0
Added bottom padding to tayga image
2017-07-09 16:18:15 +05:30
PCoder
8ba0c68410
Fixed the missing de translated text in whydcl page
2017-07-09 15:28:00 +05:30
Pcoder
2e97640a03
Merge pull request #383 from pcoder/bug/order_now_button_disabled_on_page_load
...
This PR fixes the "Order Now" button appearing blue (active) momentarily on page load. Also, calculator form is now refactored.
2017-07-09 10:33:55 +02:00
PCoder
87fb40400b
Refactored calculator form code and disabled the Order Now button by default
2017-07-09 13:44:22 +05:30
PCoder
11108a4d59
Refactored calculator form
2017-07-09 13:43:30 +05:30
PCoder
e0e5ca4503
FLOSS -> FOSS
2017-07-09 13:03:07 +05:30
PCoder
c6880294a9
Removed fuzzy translation for FOSS text
2017-07-09 12:59:48 +05:30
PCoder
25069f1579
Added the movement text
2017-07-09 12:49:16 +05:30
PCoder
cf57a8c2e0
Updated tayga.png with that provided by Sanghee
2017-07-09 12:48:35 +05:30
PCoder
05fa92dbba
Added 'movement' to english text of whydcl page
2017-07-09 12:48:00 +05:30
PCoder
b918243e4a
FLOSS -> FOSS and bieteteine -> bietet eine
2017-07-08 22:56:22 +05:30
PCoder
9f71768d26
Fixed a typo in translation
2017-07-08 22:48:49 +05:30
PCoder
e19b55c97f
Added DE translations for Why DCL page
2017-07-08 04:56:26 +05:30
Pcoder
4fe245901f
Merge pull request #375 from karthikvrao/refactor/dcl_remove_duplicate_script_imports
...
Task #3545 : Remove repeated script imports from dcl's success.html
2017-07-08 00:00:00 +02:00
PCoder
27ad654f43
Merged refactor/dcl_insert_body_end_tag from karthik into karthikvrao-refactor/dcl_insert_body_end_tag
2017-07-08 02:34:30 +05:30
Pcoder
545834d3d0
Merge pull request #377 from karthikvrao/refactor/dcl_better_indent_html
...
Task #3547 : Correct the indentation in the html template files of dcl.
2017-07-07 22:33:33 +02:00
PCoder
e298f86290
Removed button outline when inactive
2017-07-08 00:12:10 +05:30
Siarhei Puhach
1279d4efbb
Merge branch 'master' into feature/ssh_keys
2017-07-07 17:49:22 +03:00
PCoder
67da139106
Fixed one more flake warning
2017-07-07 01:23:56 +05:30
PCoder
ddacfeacf3
Fixed some flake8 errors
2017-07-07 01:20:16 +05:30
PCoder
1a20507c02
Merged master into siarheipuhach-feature/flake8
2017-07-07 00:53:58 +05:30
Karthik Rao
fd0e689562
Correct the indentation in the html template files of dcl.
2017-07-06 20:38:22 +05:30
Karthik Rao
3a673bdbac
Remove repeated script imports from dcl's success.html
2017-07-05 21:03:54 +05:30
Karthik Rao
66d0df7196
Insert missing body end tag to dcl's base.html
2017-07-05 17:09:03 +05:30
M.Ravi
d12687015b
opensource -> open source and some text adjustment
2017-07-04 22:18:23 +02:00
M.Ravi
f419ce784f
Fixed some flake8 warnings
2017-07-03 23:53:37 +02:00
M.Ravi
f9c3c80864
Merged the latest master into siarheipuhach-feature/flake8
2017-07-03 23:47:56 +02:00
Mondi Geetha
cac84f5433
Changed some text
2017-07-04 00:10:23 +05:30
Mondi Geetha
e19d2e3c13
Updated Pricing Form with updated error messages
2017-07-03 23:31:35 +05:30
Mondi Geetha
36976d923e
Merged master into whydcl
2017-07-03 23:03:51 +05:30
M.Ravi
e17792badb
Merge branch 'master' of https://github.com/ungleich/dynamicweb
2017-07-02 23:38:07 +02:00
M.Ravi
8b9359ede5
Reverted back to the default behavior of bootstrap-validator
2017-07-02 23:37:31 +02:00
Andrii Marynets
a91de372e0
Merge branch 'master' into feature/add_google_analytics
2017-07-02 23:01:42 +03:00
M.Ravi
f67343ab5c
Added missing validation code
2017-07-02 21:26:10 +02:00
Mondi Geetha
3a865bd010
Increased minimum length of the name to 3
2017-07-02 23:33:33 +05:30
Mondi Geetha
5b6a069137
Added DE translations for error messages
2017-07-02 23:16:19 +05:30
Mondi Geetha
fd856d7613
Reverted back email templates as they are part of another PR
2017-07-02 20:55:08 +05:30
Andrii Marynets
303d99d70d
Merge branch 'master' into feature/add_google_analytics
...
# Conflicts:
# datacenterlight/templates/datacenterlight/order_detail.html
2017-07-02 17:56:07 +03:00
Mondi Geetha
f48ea4714e
changed error message color
2017-07-02 18:34:17 +05:30
Mondi Geetha
2045c424ca
Added padding to LOGO in user activation email
2017-07-02 03:00:02 +05:30
Mondi Geetha
6cbbbc70be
Alinged Logo, Text, Signature to left side
2017-07-02 02:45:22 +05:30
Mondi Geetha
0a2b2c815d
Aligned Logo, Text, Signature to left
2017-07-02 02:14:18 +05:30
M.Ravi
8fb4607bdd
Fixed issues reported by flake
2017-07-01 15:53:25 +02:00
M.Ravi
c8cf166571
Merged code from siarheipuhach/dynamicweb
2017-07-01 15:18:44 +02:00
Mondi Geetha
0c969946f7
Added code for proper return when name/email are not good
2017-07-01 18:02:10 +05:30
Mondi Geetha
e4cfcbf618
Added some classes and divs for error msg alignment alongside the input field
2017-07-01 18:01:08 +05:30
Mondi Geetha
afcec7eb03
Removed unwanted code and add bootstrap-validator cdn js
2017-07-01 17:59:34 +05:30
Mondi Geetha
36877d613d
Added styles for proper positioning of error msgs
2017-07-01 17:58:42 +05:30
PCoder
b502cb5da8
Fixed logo in payment/order confirmation page not redirecting to index issue
2017-07-01 04:29:11 +05:30
PCoder
4857bc2cd8
Now fetching billing address data from session variable
2017-07-01 03:54:08 +05:30
PCoder
bd766e2073
Fixed filling up of users details while going back to payment page from order confirmation page
2017-07-01 03:11:16 +05:30
PCoder
285ce2e710
Added OS configuration to the Order Confirmation page
2017-07-01 02:16:24 +05:30
PCoder
dfd910465c
Added dcl translations used in new flow
2017-07-01 01:40:17 +05:30
Mondi Geetha
adb792770e
Fixed alignment for 100% SSD
2017-07-01 00:55:49 +05:30
Mondi Geetha
05a23bb545
Left aligned We bring future to you section
2017-07-01 00:47:29 +05:30
Mondi Geetha
a936c6cb17
Deleted whydcl-pattren.jpg
2017-07-01 00:36:00 +05:30
Mondi Geetha
b4caccaec8
Fixed dropdown menu width for de
2017-07-01 00:35:17 +05:30
Mondi Geetha
6247deb27c
Changed img alt text
2017-06-30 23:22:34 +05:30
Mondi Geetha
8510e0239e
Added some styles for landscape devices
2017-06-30 23:21:37 +05:30
Mondi Geetha
3a26b93082
Fixed Lato light font and navbar alignment
2017-06-30 21:18:45 +05:30
Mondi Geetha
646f1b0760
Fixed dropdown text alinment, Why data center Light header background and some alignment issues
2017-06-30 14:44:01 +05:30
Mondi Geetha
34395f68eb
Fixed lead text align with 100% IPv6
2017-06-30 14:42:10 +05:30
Mondi Geetha
6a96a86fd1
Fixed paragraph text back to old color
2017-06-30 13:55:55 +05:30
PCoder
160df7685c
Refactored dcl text and support email
2017-06-30 12:47:04 +05:30
PCoder
699326dc57
Made to return empty string for the template filter get_value_from_dict instead of None
2017-06-30 12:33:28 +05:30
PCoder
2350247cdb
Removed unused code
2017-06-30 12:27:18 +05:30
PCoder
1deeec4c33
Added the locale time code to new flow order detail
2017-06-30 12:18:31 +05:30
PCoder
3eca55a32a
Fixed billing address bug. Fixed back button issues in the new flow
2017-06-30 12:08:07 +05:30
PCoder
d32d2a8976
Added a form in order confirmation page
2017-06-30 12:06:41 +05:30
PCoder
4c3d8627b1
Added code to fetch cc data and put in context
2017-06-30 11:06:58 +05:30
PCoder
d0376f35f8
Now getting info in Order Confirmation from session and context
2017-06-30 11:05:34 +05:30
Andrii Marynets
2ad984504c
Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID
2017-06-30 01:23:35 +03:00
Mondi Geetha
94a69a4836
Fixed navbar dropdown that works for mobile device
2017-06-30 01:28:29 +05:30
Mondi Geetha
8754850ac9
Changed Navbar hover effect that only applicable for desktop devices
2017-06-30 01:27:21 +05:30
Mondi Geetha
f69375fb69
Added style to nav bar
2017-06-30 01:21:53 +05:30
Mondi Geetha
4ec47c687b
Added dropdown toggle function for highlets menu
2017-06-29 21:56:09 +05:30
Mondi Geetha
d2457f71e4
Changed some styles for font sizes and dropdown
2017-06-29 21:54:45 +05:30
siarheipuhach
a9c9f74aed
Fixed PEP8 violations
2017-06-29 19:23:25 +03:00
Siarhei Puhach
fcc109b8f5
Merge branch 'master' into feature/flake8
2017-06-29 18:56:50 +03:00
Mondi Geetha
059f1bb680
Changed font-family 'Lato-Regular' to 'Lato-light' except Navbar and order form and changed some styles as per template
2017-06-29 20:30:36 +05:30
Mondi Geetha
445e8e3583
Adjusted some sections as per templates
2017-06-29 20:25:30 +05:30
Siarhei Puhach
edcfd3e9f4
Added Flake8 lib and fixed PEP8 violations
2017-06-29 17:34:40 +03:00
Mondi Geetha
14bf3ad8b5
Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into task/3488/create_whydcl_page
2017-06-29 17:35:05 +05:30
Mondi Geetha
e7c652588a
Reformated the code
2017-06-29 17:34:15 +05:30
geethamondi
7eaaea58e3
Fixed some spelling mistakes
2017-06-29 14:00:31 +02:00
geethamondi
2608892537
Fixed typos
2017-06-29 13:53:10 +02:00
Mondi Geetha
80e463c3bf
Added image whydatacenterlight heder
2017-06-29 14:51:30 +05:30
Mondi Geetha
b9222c71ad
Nezwly Added styles for whydatacenterlight page header
2017-06-29 14:50:14 +05:30
Mondi Geetha
e7fea1ea39
Changed the background pattren of Whydatacenterlight page header
2017-06-29 14:49:03 +05:30
PCoder
4fc11bbe17
Made WhyDataCenterLightView a subclass of the IndexView
2017-06-29 13:14:13 +05:30
PCoder
cb6aeae1ae
Refactored the logic to OrderConfirmationView from the PaymentOrderView
2017-06-29 13:08:24 +05:30
PCoder
a2153777e4
We do not have order created when in Order Confirmation page. So removed the id parameter in url
2017-06-29 13:06:05 +05:30
PCoder
3313dab485
Added get_value_from_dict filter to obtain values from a dict in templates
2017-06-29 13:05:06 +05:30
PCoder
a3c3a5cd2e
Changed the way we get info in dcl order_detail template
2017-06-29 13:04:13 +05:30
Geetha Mondi
1a994d1e70
Removed unnecassary href link from nav logo
2017-06-28 17:52:19 +05:30
Geetha Mondi
e84897db18
Removed unnesassary BetaAccessForm class
2017-06-28 17:13:02 +05:30
Geetha Mondi
7cbc001d6a
Added style for 540 device and images
2017-06-28 15:15:19 +05:30
Geetha Mondi
4f793d516e
Changed some divs for responsive
2017-06-28 15:09:17 +05:30
Geetha Mondi
4bf4d250c9
Changed URLs of sections as pages that redirect to home page from whydatacerterlight page
2017-06-28 15:08:12 +05:30
Geetha Mondi
524b9c8090
Added trasparent menu dropdown script
2017-06-28 15:07:07 +05:30
Geetha Mondi
f8dfe1b00a
Added some style support on screen 768
2017-06-28 15:06:20 +05:30
Geetha Mondi
ab5b35f066
Created seperate page for whydatacenterlight page
2017-06-28 13:10:45 +05:30
Geetha Mondi
86984145e9
Some logo images for whydatacenterlight page
2017-06-28 13:08:28 +05:30
Geetha Mondi
1311e7ea89
Created view for whydatacenterlight page
2017-06-28 13:06:24 +05:30
Geetha Mondi
2c1c36cf94
Added url for whydatacenterlight page
2017-06-28 13:05:32 +05:30
Geetha Mondi
36fd7913fe
Added nav dropdown and added OR condition for Whydatacenterlight page
2017-06-28 13:03:32 +05:30
Geetha Mondi
d27eff9441
Added function for dropdown menu
2017-06-28 12:59:30 +05:30
Geetha Mondi
4930e7d065
Added styles for whydcl page
2017-06-28 12:58:16 +05:30
Andrii Marynets
007fc794c3
Add google analytics to data center light
2017-06-27 23:47:30 +03:00
M.Ravi
796fbbe1f8
Removed status from the order page
2017-06-23 04:38:10 +05:30
M.Ravi
aca831adac
Resolved conflicts while merging pcoder-new_flow
2017-06-23 04:35:33 +05:30
M.Ravi
3ca7153414
Changed invoice text
2017-06-23 01:34:31 +05:30
M.Ravi
5b8a26eeb3
Fixed a blunder mistake. Was using name instead of email
2017-06-23 00:31:08 +05:30
M.Ravi
5caa79f199
Added CustomUser.DoesNotExist error exception
2017-06-22 13:40:39 +05:30
M.Ravi
31c389e72c
Added order_detail.html for dcl
2017-06-22 13:23:13 +05:30
M.Ravi
c4c110b506
Added OrderConfirmationView to dcl
2017-06-22 13:21:07 +05:30
M.Ravi
e848c318d0
Addd order confirmation url
2017-06-22 13:18:54 +05:30
M.Ravi
041352ac6d
Cleaned up some commented code
2017-06-22 00:28:44 +05:30
M.Ravi
bbfc7e8515
Not persisting stripe details to db
2017-06-21 23:37:36 +05:30
M.Ravi
66f82572f1
Added payment url
2017-06-21 13:15:37 +05:30
M.Ravi
52524a97a6
Added PaymentOrderView
2017-06-21 13:14:58 +05:30
M.Ravi
2959159863
Added cache_control decorator to control cache while returning back to the index page
2017-06-21 01:40:55 +05:30
M.Ravi
b27342b493
Added dcl_text instead the hardcoded text
2017-06-20 23:44:10 +05:30
M.Ravi
543a52baf9
Fixed some more translations
2017-06-20 01:00:48 +05:30
M.Ravi
b971751e2b
Updated click here text in de
2017-06-20 00:22:12 +05:30
M.Ravi
ed26ac8b59
Updated dcl's django.po to resolve some conflict
2017-06-19 12:44:48 +05:30
M.Ravi
47632c6bd1
Updated the django.po for datacenterlight
2017-06-19 12:34:58 +05:30
M.Ravi
a7e9946a4f
Refactored user activation html email template to use proper translation and parameters
2017-06-19 12:34:01 +05:30
M.Ravi
bf941539d7
Refactored user_activation.txt email template
2017-06-19 12:32:08 +05:30
Levi Velázquez
5271591cf3
Merge pull request #324 from pcoder/feature/3296/confirm_emails
...
Feature/3296/confirm emails
2017-06-15 15:22:00 -05:00
Levi Velázquez
3aa9b573cc
Merge pull request #343 from ungleich/fix_translation
...
Fixed translations of validation messages
2017-06-15 13:38:16 -05:00
M.Ravi
06af225c97
Updated proper translation corrections
2017-06-16 00:00:26 +05:30
M.Ravi
36567071c0
Removed OrderView as we no longer use it
2017-06-15 23:36:58 +05:30
M.Ravi
e897bb9c22
Removed unused /order url
2017-06-15 23:32:20 +05:30
M.Ravi
6c588e3531
Deleted the order.html
2017-06-15 23:31:19 +05:30
M.Ravi
a56d08e729
Fixed translations of validation messages
2017-06-15 06:29:31 +05:30
M.Ravi
0b034ec2f8
Fixed typo 'Standort' instead of 'Strandort'
2017-06-15 04:29:57 +05:30
Henry Bravo
7992e39962
Generated .po
2017-06-14 17:34:26 -05:00
Henry Bravo
739a92505d
deleted home.htm
2017-06-14 17:29:26 -05:00
Henry Bravo
fb860b9a8d
fixed typo and delete .mo
2017-06-14 17:16:43 -05:00
Henry Bravo
b2379f7a02
Fixed DE Typo, and added text in calculator box
2017-06-14 16:51:42 -05:00
Henry Bravo
8acd249b4d
Create Templatetag for change language whit the current path
2017-06-13 22:35:15 -05:00
Levi
8ec290a59f
cleaned up index.html
2017-06-13 14:11:11 -05:00
Levi
9333532662
Merge branch 'master' into develop
2017-06-13 14:07:52 -05:00
Levi
11e59c8ea3
added translations
2017-06-13 13:47:55 -05:00
Henry Bravo
2d3e446568
fix locale
2017-06-13 13:39:47 -05:00
Henry Bravo
a03f2f8f89
Fix conflicts
2017-06-13 10:36:39 -05:00
Levi
b5bb26e445
added missing translations for datacenterlight
2017-06-13 01:48:36 -05:00
Levi
89dedab8ba
resolved henry latest conflicts
2017-06-13 01:12:51 -05:00
Levi
c7d29be24c
Merge branch 'master' into develop
2017-06-12 23:51:03 -05:00
M.Ravi
1a7615dc9a
Fixed a typo
2017-06-13 05:03:46 +05:30
M.Ravi
83802a0a52
Added from_address to EmailMessage
2017-06-13 04:39:30 +05:30
f2aa5377d8
month added to landing calculator box
2017-06-11 23:32:37 +02:00
Levi Velázquez
d2a8c13b9e
Merge branch 'master' into bug/3328/dcl_email_headers
2017-06-11 12:30:09 -05:00
M.Ravi
943fc741bf
Modified the IndexView to send text email on receiving new order
2017-06-11 20:06:54 +05:30
M.Ravi
d7a2335cf4
Merge branch 'master' into telmich-feature/nonhtml-email
2017-06-11 19:56:35 +05:30
M.Ravi
a29ceb765f
Updated the translation for the modified text
2017-06-11 17:46:42 +05:30
M.Ravi
8e95ed304b
Updated the text in dcl index.html template
2017-06-11 16:57:20 +05:30
M.Ravi
24402a2ec8
Refactored the styles
2017-06-11 16:53:57 +05:30
M.Ravi
880e0f0dde
Added functions to handle get and post requests. On get, we need to create a opennebula connection to fetch the templates. On successful post of the form, we need to send email and redirect user to order-success
2017-06-11 16:32:38 +05:30
M.Ravi
47d882d1fc
Moved the calculator to the index.html template
2017-06-11 16:29:24 +05:30
M.Ravi
d792c22e4e
Created landing page style price-calc-section-landing which is same as price-calc-section except for padding (we don't need it in the landing page)
2017-06-11 16:28:11 +05:30
M.Ravi
32e5011241
Added user_activation email templates
2017-06-11 05:08:13 +05:30
M.Ravi
9b40af3975
Removed the unnecessary new_order_notification* email templates as we no longer use them.
2017-06-10 15:41:25 +05:30
M.Ravi
3750ba5182
Changed the to and reply-to fields for EmailMessage to list, as it expects input of that type
2017-06-10 12:42:31 +05:30
Nico Schottelius
9f2f0f7db3
Send order emails as plain text
2017-06-10 00:33:26 +02:00
Henry Bravo
d2e9096cc2
Fix conflicts in url footer and fix navbar language
2017-06-09 16:47:39 -05:00
Henry Bravo
7004536a19
Fix conflicts
2017-06-09 16:18:41 -05:00
Levi
24ecdd2f26
footer links
2017-06-09 16:08:37 -05:00
Henry Bravo
54b339a546
Staging fix and cleaned html
2017-06-09 15:37:14 -05:00
Levi
d43855adda
fixed #3350 , #3328 , #3316 , #3339
2017-06-09 15:36:14 -05:00
Levi
331b7dea98
Merge branch 'master' into develop
2017-06-09 10:37:06 -05:00
M.Ravi
132629734a
Merge branch 'telmich-feature/introduce_templating'
2017-06-09 12:34:15 +05:30
M.Ravi
382b0b979d
Modified po/mo files to fix de typos (bug 3363)
2017-06-09 12:10:36 +05:30
M.Ravi
47970fb00a
Added load staticfiles and i18n and extended datacenterlight/base.html explicitly
2017-06-09 11:32:51 +05:30
Nico Schottelius
b15bae4940
Add template base.html
2017-06-08 21:55:35 +02:00
M.Ravi
a60ef7cf7a
Changed BaseEmail to accept from_address to modify the from header accordingly
2017-06-07 11:35:16 +05:30
M.Ravi
a131489e8c
Fixed font on order page for mobile view. Changed from Lato-black to Montserrat-Bold
2017-06-07 02:40:45 +05:30
M.Ravi
d8ef935fae
Updated text on the button to Request Beta Access to go along the text alongside
2017-06-07 02:13:21 +05:30
M.Ravi
06f95dc5ed
Made to take the user to /order on click of Order Now button
2017-06-07 02:12:35 +05:30
M.Ravi
94bac7222c
Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before.
2017-06-07 02:02:31 +05:30
M.Ravi
bef6b03872
Reverted pricing.html to what was before. We should create a new template for order.
2017-06-07 01:35:05 +05:30
M.Ravi
c111ad13a8
Updated translation text after completion of manual order.
2017-06-07 01:26:56 +05:30
M.Ravi
366f11be83
Fixed an issue related to redirection to datacenterlight/order url
2017-06-07 01:07:47 +05:30
M.Ravi
6a3f4578db
Updated mo file to include the change for exclamation mark missing in german translation
2017-06-07 00:59:19 +05:30
M.Ravi
dcdb06d4f6
Added missing exlamation mark for german translation. Updated the translation
2017-06-07 00:47:40 +05:30
M.Ravi
663ea2d713
Merged master into feature/manualorder
2017-06-07 00:41:27 +05:30
M.Ravi
69001db65f
Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files.
2017-06-07 00:16:54 +05:30
M.Ravi
9ffd32b4cb
Merge branch 'master' of https://github.com/HenryGBC/dynamicweb into henry_pr
2017-06-06 22:10:35 +05:30
Henry Bravo
6f6277cc49
Mobile styles to calculator card
2017-06-06 10:36:47 -05:00
Henry Bravo
b5f93e4ea7
align buttons
2017-06-06 10:33:36 -05:00
Levi
96272ffd44
added mo files
2017-06-06 00:08:22 -05:00
Levi
6fa14971d9
Merge branch 'master' of github.com:ungleich/dynamicweb
2017-06-05 23:08:58 -05:00
M.Ravi
d31b05a219
Added jquery validation for the order form
2017-06-06 05:26:02 +05:30
M.Ravi
74c57a42db
Added top margin style for error messages
2017-06-06 05:24:39 +05:30
M.Ravi
949f47d124
Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template
2017-06-06 04:28:41 +05:30
M.Ravi
b54b46c08b
Renamed success url to order_success for clarity.
2017-06-06 04:23:15 +05:30
M.Ravi
474e0ddc95
Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this)
2017-06-06 04:22:03 +05:30
M.Ravi
92fb72197d
Resolved some conflicts
2017-06-06 03:47:37 +05:30
M.Ravi
f4a81e9096
Fixed getting template name from template id
2017-06-06 03:43:50 +05:30
M.Ravi
b68f116931
Added the logic to handle orders manually
2017-06-06 03:09:34 +05:30
M.Ravi
d7625712f1
Changed template variable name in email template for new order notification
2017-06-06 03:02:57 +05:30
M.Ravi
4ad45dfd43
Added notification email template
2017-06-06 02:55:07 +05:30
Henry Bravo
515cbff001
copy PricingView
2017-06-05 16:03:32 -05:00
Henry Bravo
2ead42bd1a
Add input fields (email, name) in Calculator (Pricing page) and Sucess page
2017-06-05 15:35:48 -05:00
M.Ravi
5583648293
Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing
2017-06-06 01:44:23 +05:30
Henry Bravo
c69694274f
Fix conflicts
2017-06-05 14:55:41 -05:00
Henry Bravo
b44ab0ce0a
Add input fields (email, name) in Calculator (Pricing page)
2017-06-05 14:30:41 -05:00
Henry Bravo
ba03cf232e
'what is it' section text change and fixed typo
2017-06-03 21:57:21 -05:00
Henry Bravo
9b121cc702
improveded mobile responsiveness
2017-06-03 21:19:13 -05:00
Nico Schottelius
d8bb051f23
Remove unused code
2017-06-03 16:03:02 +02:00
modulos
31e9377818
Merge branch 'develop' into hosting_i18n
2017-06-03 09:59:48 +02:00
Levi Velázquez
8d47018aae
Merge pull request #301 from levivm/develop
...
removed more info button
2017-06-02 10:37:24 -05:00
Levi
83705984d0
removed more info button
2017-06-02 10:36:17 -05:00
Henry Bravo
be04bee643
Fix center login pages
2017-06-01 15:40:19 -05:00
Henry Bravo
851ae298e9
Collapse navbar when i clicked url dcl
2017-06-01 14:49:05 -05:00
modulos
37a9629408
Add more translations
2017-05-30 15:57:36 +02:00
modulos
9416586d0b
Merge branch 'develop' into hosting_i18n
2017-05-30 15:10:22 +02:00
M.Ravi
9a7df541c5
Removed a bogus call to languages() method that caused no showing of the VM templates
2017-05-30 12:20:13 +05:30
Henry Bravo
a7c28f5644
Fix conflic translates
2017-05-29 15:05:11 -05:00
Henry Bravo
8207bc2dab
Fixed pricing page mobile
2017-05-29 14:54:18 -05:00
modulos
48050a2360
Remove .mo files and update .po files
2017-05-29 16:12:28 +02:00
modulos
40fe3f4d29
Merge branch 'develop' into hosting_i18n
2017-05-29 15:47:22 +02:00
modulos
1d95f87b8d
Merge branch 'develop' into dcl_i18n
2017-05-29 15:25:18 +02:00
modulos
6937fb98f0
Merge branch 'develop' into hosting_i18n
2017-05-29 14:00:53 +02:00
Henry Bravo
aaf1dcbc7e
Fix input width
2017-05-28 15:13:13 -05:00
Henry Bravo
8d8b387cc7
Fix select languages in dcl
2017-05-27 12:49:42 -05:00
Henry Bravo
ac28ab0d6b
Fix texts bugs and hosting mobile design
2017-05-27 10:39:30 -05:00
modulos
f8bbd94f8f
Change 15 to 10 GB Storage
2017-05-26 17:12:37 +02:00
modulos
a044490ec3
Add i18n to hosting/order
...
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
2017-05-26 17:02:22 +02:00
modulos
5869c6dd87
Add i18n to datacenterlight
...
The pricing page is now fully i18n as well as the subscription modal
2017-05-26 15:53:21 +02:00
Henry Bravo
22a876e134
Fix and add input values in calc
2017-05-25 16:16:18 -05:00
Henry Bravo
792219f6ac
Fix image beta
2017-05-25 15:18:42 -05:00
Henry Bravo
7b452740d7
fix values
2017-05-25 14:24:04 -05:00
Henry Bravo
fbc1ab28b7
Fix minimun values calculator order widget
2017-05-25 13:40:45 -05:00
Henry Bravo
549acd400a
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-05-25 13:31:16 -05:00
Henry Bravo
c91a61b33c
Fix order columns in hosting/payment
2017-05-25 13:27:47 -05:00
Noe Thalheim
1ff411e426
Merge branch 'develop' of https://github.com/ungleich/dynamicweb/
2017-05-25 18:38:58 +02:00
Noe Thalheim
cb73bf7b80
Replace lorem ipsum text
2017-05-25 18:37:42 +02:00
Levi Velázquez
505e5920c9
Merge pull request #278 from Modulos/pr/henry
...
Henry's changes
2017-05-25 10:16:13 -05:00
Levi
ee80181a55
added redirect after create vm ssh key
2017-05-24 10:58:16 -05:00
Henry Bravo
f2649251c2
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-05-23 18:32:21 -05:00
Henry Bravo
c205bb05e8
Fixed Pricing pages bugs
2017-05-23 18:32:06 -05:00
modulos
229c8b9cfc
Disable checkbox
2017-05-23 20:27:26 +02:00
modulos
e6f2157b83
Correct pricing page redriection
2017-05-23 19:58:29 +02:00
Henry Bravo
398b7062e0
resolve conflicts
2017-05-23 12:13:44 -05:00
Henry Bravo
c383156c42
Pass params in form pricing
2017-05-23 12:06:48 -05:00
Levi
e278ff742d
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-05-23 11:48:25 -05:00
Levi
8d81220202
changed virtual machine list
2017-05-23 11:48:02 -05:00
Levi Velázquez
21d37ffca4
Merge pull request #263 from Modulos/beta_modal
...
Show modal after beta access signup
2017-05-23 11:10:01 -05:00
Henry Bravo
506fbca204
Design calculator page
2017-05-22 23:35:29 -05:00
Henry Bravo
30f042cdc3
Fixed bugs style dcl
2017-05-22 13:00:27 -05:00
modulos
88731d6371
Change buy now to order now and add link
2017-05-22 18:25:56 +02:00
modulos
920e7669dc
Show modal after beta access signup
...
The beta access form is now in it's own html page. this makes it easier
to work with djangos form validation with reloading the whole page.
2017-05-22 18:03:33 +02:00
Levi
1aba5cbee5
fixed datacenterlight page
2017-05-20 11:38:37 -05:00
Levi
3503e6568e
Merge branch 'develop' into opennebula_api
2017-05-20 11:23:13 -05:00
Levi
03ec8ef674
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
2017-05-20 11:20:30 -05:00
Levi
ec198c74f9
fixed translations
2017-05-20 11:19:58 -05:00
Levi
5dd54f4219
added redirect
2017-05-20 11:06:10 -05:00
verysanghee
14e87feab2
Update django.po
2017-05-20 17:11:50 +02:00
verysanghee
5cead83c89
typo
2017-05-20 17:08:24 +02:00
Henry Bravo
00101921c7
Fixed typo bugs dcl
2017-05-19 22:41:10 -05:00
Henry Bravo
767e95895a
Redesign DCL Page
2017-05-18 00:13:00 -05:00
M.Ravi
1ca884e1f6
Removed 'More info' button from datacenterlight index page.
2017-05-14 21:09:16 +05:30
M.Ravi
dec1ccd180
Created url for buy button on datacenterlight home page and redirection
...
of ^hosting/ endpoint to take to hosting app's login page.
2017-05-14 12:44:11 +02:00
M.Ravi
d537fcb118
Manual merge of ungleich/master into opennebula-integration
2017-04-24 03:01:05 +05:30
HenryGBC
b853ce84c5
Fix mobile sspace datacenterlight
2017-03-31 22:55:01 -04:30
HenryGBC
80ecb963b3
Add name field i beta program
2017-03-30 20:21:15 -04:30
HenryGBC
227d69178f
Add modal sucess
2017-02-17 09:43:32 -04:30
Levi
38934b0883
added request beta notification
2017-02-16 22:32:14 -05:00
Levi
ea2f6444db
Added alplora and datacenter beta program
2017-02-14 23:34:06 -05:00
Levi
41362fc948
added translations
2017-01-23 22:34:22 -05:00
Levi
896c07930b
fixing language swticher
2017-01-13 12:26:03 -05:00
Levi
640819c7de
Fixed #2806 and #2863
2017-01-09 19:49:10 -05:00
Levi
ef07f5da83
#2905
2017-01-09 09:34:25 -05:00
Levi
f9387cd6b8
Finished #2883
2017-01-06 10:24:34 -05:00
Levi
bf82aa61f1
Fixed #2862 . Fixed #2861 . Fixed #2864 . Fixed #2865
2017-01-04 20:31:53 -05:00
Levi
ed28fc411e
fixed some index datacenterlight issues
2016-12-21 01:24:04 -05:00
Levi
db13e642fc
fixed datacenter index link
2016-12-21 01:06:27 -05:00