Arvind Tiwari
3cd89e244e
minor style fixes
2018-02-28 04:22:48 +05:30
Arvind Tiwari
d85e1c671b
All major DCL plugins added
2018-02-28 04:09:19 +05:30
Arvind Tiwari
8469dd34a5
css style fix
2018-02-24 20:25:14 +05:30
Arvind Tiwari
18ef605e53
fix styles for dcl cms plugin
2018-02-24 20:22:27 +05:30
PCoder
c10dc9f2e2
Remove some more beta access resources
2018-02-24 10:12:32 +01:00
Arvind Tiwari
e9e9da519b
fix flake8 warning
2018-02-23 19:05:45 +05:30
Arvind Tiwari
80ed92eece
merged master
2018-02-23 18:14:31 +05:30
Pcoder
1d1232e617
Merge pull request #573 from pcoder/task/3554/remove_beta_url
...
Task/3554/Remove beta access resources
2018-02-22 23:32:41 +01:00
Arvind Tiwari
d22b57e011
Merge branch 'master' into task/3713/clean_up_css
2018-02-23 01:38:19 +05:30
M.Ravi
74a8a28c52
Reorganize imports and fix flake8 error
2018-02-22 18:20:12 +01:00
M.Ravi
35d6fd8fd3
Remove datacenterlight/order-success urlconf, view and template as
...
we are not using it anymore
2018-02-22 17:53:51 +01:00
Arvind Tiwari
26abbbc091
contact section style fix
2018-02-22 18:41:21 +05:30
PCoder
6477401093
Remove beta access related email templates
2018-02-22 06:45:58 +01:00
PCoder
8aeefd7144
Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png
...
and corresponding references in the code
2018-02-20 19:56:22 +01:00
PCoder
a5ad1a9edf
Remove unused beta access templates and js
2018-02-20 19:48:52 +01:00
PCoder
3769e00c8c
Fix a PEP8 error
2018-02-20 19:22:28 +01:00
M.Ravi
8ba3bfc89f
Dcl migration for removing beta-access related tables
2018-02-20 15:24:41 +01:00
M.Ravi
5f136a9dfe
Remove BetaAccess related models
2018-02-20 15:13:12 +01:00
M.Ravi
a90bc3b3ce
Remove BetaAccess related forms
2018-02-20 15:11:09 +01:00
M.Ravi
3cdf915b86
Remove more classes related to Beta
2018-02-20 15:06:24 +01:00
M.Ravi
4f1c5d7c77
Remove BetaProgramView
2018-02-20 12:19:30 +01:00
M.Ravi
cc2e18a7d2
Remove /beta_access url from dcl
2018-02-20 11:58:29 +01:00
M.Ravi
3389803493
Remove /beta-program url from dcl
2018-02-20 11:54:42 +01:00
Arvind Tiwari
3bb64478ed
merge master
2018-02-19 02:34:23 +05:30
Arvind Tiwari
aec7f99aee
reduce the scroll amount on click of nav menu
2018-02-15 02:11:08 +05:30
Arvind Tiwari
adb0db101d
Update django.po
2018-02-10 22:11:51 +05:30
Arvind Tiwari
6c3cb5edaf
dcl footer link color
2018-02-09 07:36:04 +05:30
Arvind Tiwari
909067e11f
removed vendor files from hosting and using the ones from dataccenterlight
2018-02-09 06:50:17 +05:30
Arvind Tiwari
4145129974
remove whitespace from output
2018-02-08 19:10:37 +05:30
Arvind Tiwari
b9c53717e3
Merge branch 'master' into task/3713/clean_up_css
2018-02-08 17:11:41 +05:30
Arvind Tiwari
a43428539f
optimize script documentation and report output
2018-02-05 02:47:18 +05:30
Arvind Tiwari
4ebd52cd69
fix user keys layout, adjust @media breakpoints to bs4, fix more unused css, optimize script
2018-02-04 03:20:27 +05:30
Arvind Tiwari
18df2fd647
fix glasfaser page
2018-01-31 05:23:05 +05:30
Arvind Tiwari
527b39c28f
fix missing dependency
2018-01-31 04:25:17 +05:30
Arvind Tiwari
6bb7f2f187
create vm error fix, more css optimizations
2018-01-31 04:22:34 +05:30
Arvind Tiwari
789d8a408f
css optimizations
2018-01-30 19:08:36 +05:30
Arvind Tiwari
a7a3c1cc15
removed unused styles
2018-01-18 23:42:09 +05:30
Arvind Tiwari
b5cc0d4d1f
removed sekizai
2018-01-17 18:04:11 +05:30
Arvind Tiwari
a374421963
order details page
2018-01-17 17:32:32 +05:30
Arvind Tiwari
fb6ddd3512
moved styles to common.css, removed more unused styles
2018-01-17 16:31:46 +05:30
PCoder
71071bf9ed
Update dcl's django.po: Add translation for - Terms of Use
2018-01-16 00:13:40 +01:00
PCoder
b88c19c2c9
Add terms-of-service item to dcl's footer
2018-01-16 00:11:32 +01:00
Arvind Tiwari
4fd761c396
removed unused classes from datacenterlight css files
2018-01-10 02:47:25 +05:30
Arvind Tiwari
df22255104
remove unused scripts and links, mve styles for dcl into dcl
2018-01-09 22:12:53 +05:30
Arvind Tiwari
0697492ab8
removed unused css files
2018-01-08 07:36:30 +05:30
Arvind Tiwari
157cc5ac5d
fix datacenterlight templates
2018-01-08 00:56:54 +05:30
PCoder
815b5392ac
Merge branch 'master' into task/3973/change_dcl_contact_info
2017-12-23 07:38:28 +01:00
PCoder
4870649e93
Update datacenterlight contact address
2017-12-23 00:49:50 +01:00
PCoder
6c017d1581
Remove commented translation
2017-12-22 23:59:51 +01:00
PCoder
485a7e1897
Merge mainRepo/master into task/3601/reduce_min_ram_to_1G
2017-12-22 22:10:08 +01:00
Arvind Tiwari
fc9b901f9a
translations added
2017-12-22 01:06:55 +05:30
PCoder
3852ce04de
Set default RAM value to 2G in landing and hosting VM calculators
2017-12-21 08:41:29 +01:00
PCoder
4dff4e07cb
Change minimum required RAM from 2GB to 1GB
2017-12-21 01:25:52 +01:00
PCoder
a339f65170
Correct _target to target and blank to _blank
2017-12-12 21:02:18 +01:00
PCoder
56962d5fdf
Use target=_blank for links in landing payment page
2017-12-12 20:58:07 +01:00
PCoder
54185792cf
Add resend activation link in the landing payment page
2017-12-12 20:48:47 +01:00
PCoder
c24d81042b
Merge branch 'master' into task/3747/multiple_cards_support
2017-12-04 00:03:11 +01:00
Arvind Tiwari
2d05720016
merged master
2017-11-27 16:30:42 +05:30
PCoder
4a30438704
Update datacenterlight django.po
2017-11-27 08:38:10 +01:00
PCoder
45777878d7
Merge branch 'master' into task/3672/cleaning_existing_tests
2017-11-26 23:19:04 +01:00
PCoder
a9a77cd6ac
Add Stripe key to skipif condition for CeleryTaskTestCase
2017-11-26 00:06:58 +01:00
PCoder
e95967c668
Update skipif condition for dcl.tests.test_create_vm_task
2017-11-26 00:01:40 +01:00
PCoder
a0e36adebc
Put skipIf condition at correct place
2017-11-25 21:56:48 +01:00
PCoder
7be92c72d4
Add skipIf condition to create_vm_task
2017-11-25 21:49:04 +01:00
PCoder
4d68f3bcbe
Reformat code
2017-11-25 18:52:00 +01:00
Arvind Tiwari
71a522977f
glasfaser height fix, about section last image fix, testimonials logo fix
2017-11-25 04:32:33 +05:30
PCoder
16e5fb8f5c
Add multiply filter
2017-11-22 00:16:39 +01:00
PCoder
6d7d24eafe
Remove unwanted br tag in de translation
2017-11-13 19:40:00 +01:00
PCoder
0038bb8ee4
Remove commented translation
2017-11-13 19:37:46 +01:00
PCoder
629eb41ff5
Remove "From confirmation to access" text
2017-11-13 19:00:59 +01:00
PCoder
0b340f29e1
Add DE translation
2017-11-11 11:40:26 +01:00
PCoder
de76311ea3
Change "affordable vm hosting.." text
2017-11-11 11:39:29 +01:00
PCoder
c438c0d8cb
Add some de translations
2017-10-31 09:38:36 +01:00
PCoder
f9bd849333
Remove redundant "previous" text
2017-10-31 09:05:49 +01:00
PCoder
24d904288f
Clear token and card form variables explicitly
2017-10-30 00:26:18 +01:00
PCoder
83dbae74e6
Add missing card_id to session variables to be cleared
2017-10-29 22:54:33 +01:00
PCoder
4be2796270
Clean up some unnecessary code
2017-10-29 22:40:21 +01:00
PCoder
62f30bf03c
Remove some commented and unnecessary code
2017-10-29 22:03:19 +01:00
PCoder
edac806c11
Some more refactoring
2017-10-29 21:56:29 +01:00
PCoder
3d8f81339b
Refactor, reorganize some code
2017-10-29 21:49:15 +01:00
PCoder
618d0004f2
Rearrange code
2017-10-29 21:41:54 +01:00
PCoder
af1690b846
Fix: obtaining stripe_customer in landing flow
2017-10-29 21:36:12 +01:00
PCoder
abe8c9efa5
Add error details to messages datacenterlight landing flow
2017-10-29 15:05:32 +01:00
PCoder
bea3477d84
Handle errors related to payment by redirecting to payment page
2017-10-29 14:45:14 +01:00
PCoder
82ad9ac337
Add selected card handling in landing flow "Order confirmation" page
2017-10-29 13:17:26 +01:00
PCoder
248283b369
Show user's credit cards dynamically in landing payment page
2017-10-28 23:44:06 +02:00
PCoder
2a59a3336b
Add metadata (vm_id) to Stripe subscription
2017-10-28 20:25:18 +02:00
Arvind Tiwari
1839a1c27c
translation re compilation
2017-10-17 00:35:51 +05:30
Arvind Tiwari
2a71be354b
conflicts resolved
2017-10-17 00:27:50 +05:30
Arvind Tiwari
387cad476f
Update translations for user activation email
2017-10-17 00:19:03 +05:30
Arvind Tiwari
9bc86255c4
user account details added and translation fix
2017-10-16 01:04:49 +05:30
Arvind Tiwari
c60d45c292
merge master
2017-10-15 01:52:29 +05:30
Arvind Tiwari
7b71ba1749
merged master
2017-10-15 00:10:02 +05:30
M.Ravi
64695d0a38
Remove commented code
2017-10-13 00:57:30 +02:00
M.Ravi
152c930180
Redirect explicitly to the payment page on dcl landing login
2017-10-12 22:50:54 +02:00
Arvind Tiwari
606a687bc7
conflicts resolved
2017-10-13 02:08:28 +05:30
M.Ravi
4f6fd52ce8
Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page
2017-10-11 21:23:13 +02:00
Arvind Tiwari
f7e6c26a34
merged master
2017-10-11 01:28:35 +05:30
M.Ravi
09f67e46b9
glasfaser: Fix email to parameter
2017-10-10 21:22:11 +02:00
Arvind Tiwari
7410a73e60
from email removed direct dependency from post request
2017-10-11 00:36:17 +05:30
M.Ravi
1c67d66ff7
Merge remote-tracking branch 'mainRepo/master' into task/3829/handle_landing_login_fail_in_same_page
2017-10-10 19:22:37 +02:00
Arvind Tiwari
b908fc582c
Merge branch 'master' into task/glasfaser_page
2017-10-10 22:37:38 +05:30
Arvind Tiwari
ff3f0e8ed3
converted png to jpg, removed unused scripts/styles, cdn links added
2017-10-10 22:16:51 +05:30
Arvind Tiwari
452089e103
translation fix
2017-10-10 21:38:49 +05:30
Arvind Tiwari
dedbcec8e7
mobile layout fix, animation directions changed
2017-10-10 21:32:01 +05:30
Arvind Tiwari
0616be9864
op text sections added, from email fixed
2017-10-10 20:58:11 +05:30
Arvind Tiwari
8c37f02b91
text changed
2017-10-10 02:38:19 +05:30
Arvind Tiwari
f68857cacb
border padding aded
2017-10-10 02:18:56 +05:30
Arvind Tiwari
c1d03b1281
hero image changed to progressive
2017-10-10 02:16:27 +05:30
Arvind Tiwari
96a993b235
images added, ungleich landing modified
2017-10-10 02:09:03 +05:30
Arvind Tiwari
695a8687fd
first iteration
2017-10-10 00:04:19 +05:30
M.Ravi
8b36d9cba4
Create stripe customer if not exists
2017-10-08 21:01:25 +02:00
M.Ravi
b44948b277
Prefill cc info on landing for logged in case
...
Attention: We still support only one card
2017-10-08 20:21:20 +02:00
M.Ravi
86c931cde1
Remove prefixes for billing_address_forms
2017-10-08 19:24:58 +02:00
M.Ravi
cdbab541bc
Refactor billing_address_form for not logged in case
2017-10-08 17:29:10 +02:00
M.Ravi
5a2657e357
Create billing_address_form only for a logged user
2017-10-08 17:21:38 +02:00
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
cc2e08aff5
translations
2017-10-06 02:02:22 +05:30
Arvind Tiwari
6536991209
list all cards, card_input template
2017-10-06 01:17:35 +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
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
