PCoder
|
21084cdc9f
|
Initialize minRam js variable from what is passed from backend
|
2018-09-27 09:07:28 +02:00 |
|
PCoder
|
12f139976d
|
Simplify logic to set min_ram in the calculator form
|
2018-09-27 09:06:39 +02:00 |
|
PCoder
|
da21699212
|
Merge branch 'master' into task/5681/offer-512mb-ram
|
2018-09-26 23:10:17 +02:00 |
|
PCoder
|
3075cffd77
|
Include product_id in generic payment Stripe plan name
|
2018-09-26 23:01:04 +02:00 |
|
PCoder
|
232022aaaf
|
Fix flake8 errors
|
2018-09-26 22:51:34 +02:00 |
|
PCoder
|
b7929a16e2
|
Update datacenterlight django.po
|
2018-09-26 22:45:09 +02:00 |
|
PCoder
|
6c03e3f712
|
Change generic payment subject and correct misplaced comma
Data Center LightConfirmation of your payment ->
Confirmation of your payment
|
2018-09-26 22:42:33 +02:00 |
|
PCoder
|
72c16713a7
|
Update .po of datacenterlight
|
2018-09-26 22:37:32 +02:00 |
|
PCoder
|
52d048a555
|
Add missing Cheers string in email
|
2018-09-26 22:35:11 +02:00 |
|
PCoder
|
3148dbccf8
|
Translate text + reformat
|
2018-09-26 22:31:06 +02:00 |
|
PCoder
|
84056a5b36
|
Correct generic payment email as per Sanghee's corrections
|
2018-09-26 22:21:59 +02:00 |
|
PCoder
|
1041284866
|
Refactor moment.js locale date code to virutal_machine_detail.js
|
2018-09-26 21:52:12 +02:00 |
|
PCoder
|
737681136f
|
Correct flake8 error
|
2018-09-26 21:23:46 +02:00 |
|
PCoder
|
41cba9daa3
|
Show product name in dcl order detail template
|
2018-09-26 09:15:49 +02:00 |
|
PCoder
|
4575ff60ec
|
Refactor validation code + Add product_id to context
|
2018-09-26 09:15:24 +02:00 |
|
PCoder
|
9ff20491bd
|
Merge branch 'master' into task/5690/generic-payment-page
|
2018-09-25 23:25:22 +02:00 |
|
PCoder
|
c9ac959ff6
|
Change DCLNavbarPlugin to show login option only if set
|
2018-09-25 22:29:58 +02:00 |
|
PCoder
|
51c5fa98dd
|
Save description and product_id
|
2018-09-25 02:14:11 +02:00 |
|
PCoder
|
ed7ffb355f
|
Server side validation of the POSTed product
|
2018-09-25 02:13:39 +02:00 |
|
PCoder
|
1988020006
|
Handle generic-payment-form POST
To return pricing based on user's selected product
|
2018-09-25 02:12:42 +02:00 |
|
PCoder
|
b348c93fee
|
Add product hidden input type
To distinguish generic-payment-form submit
|
2018-09-25 01:56:10 +02:00 |
|
PCoder
|
481f13d20c
|
Check key existence
|
2018-09-24 22:27:25 +02:00 |
|
PCoder
|
d99271f71d
|
Redirect users to orders after generic payment is successful
|
2018-09-23 17:19:24 +02:00 |
|
PCoder
|
ff993e32db
|
Revert back to POST parameters for billing-form method
|
2018-09-23 17:01:29 +02:00 |
|
PCoder
|
dd82bdc9da
|
Fix a flake8 error
|
2018-09-23 13:27:33 +02:00 |
|
PCoder
|
7f3b916c58
|
Reformat code
|
2018-09-23 13:26:48 +02:00 |
|
PCoder
|
d23624c525
|
Modify datacenterlight/views.py to includes various cases of generic payment
|
2018-09-23 13:15:26 +02:00 |
|
PCoder
|
bc3eaaa7eb
|
Move csrf_token out of form loop
|
2018-09-23 13:10:26 +02:00 |
|
PCoder
|
bce47032ab
|
Handle generic payment separately in order_detail.html
|
2018-09-23 13:03:47 +02:00 |
|
PCoder
|
730492089b
|
Modify PaymentOrderView to accomodate the new generic payment case (WIP)
|
2018-09-22 08:20:49 +02:00 |
|
PCoder
|
429dd10b75
|
Modify dcl landing_payment.html to accomodate the new generic
payment form
|
2018-09-22 08:17:46 +02:00 |
|
PCoder
|
76efc35324
|
Add enable_512mb_ram option in model/plugin
|
2018-09-22 06:44:37 +02:00 |
|
PCoder
|
8a30100488
|
Use price in stripe plan name too
|
2018-09-05 23:26:51 +02:00 |
|
PCoder
|
e230f2ac8c
|
Merge master into 5151/gdpr_modal
|
2018-08-22 23:25:11 +02:00 |
|
PCoder
|
9c5363ef55
|
Merge branch 'master' into bugfix/show_meta_description_in_cms_page
|
2018-08-22 21:42:37 +02:00 |
|
PCoder
|
13876c24c1
|
Update doc
|
2018-08-22 00:42:50 +02:00 |
|
PCoder
|
f56933021f
|
Also send an email if manage_ssh_key does not complete in time
|
2018-08-22 00:37:40 +02:00 |
|
PCoder
|
2ff7eaea65
|
Sleep additional 10 seconds before running manage_public_key
|
2018-08-22 00:25:59 +02:00 |
|
PCoder
|
893c8ed08b
|
Fix imports
|
2018-08-22 00:14:17 +02:00 |
|
PCoder
|
3b07687d3e
|
Refactor ping_ok from datacenterlight.utils to utils.hosting_utils
|
2018-08-22 00:12:14 +02:00 |
|
PCoder
|
a55587dbf3
|
Wait for VM to be pingable before doing a manage_public_key
|
2018-08-21 23:49:47 +02:00 |
|
PCoder
|
91021d7612
|
Add ping_ok utility method
|
2018-08-21 23:24:40 +02:00 |
|
M.Ravi
|
9381327a12
|
Change author of various cms pages to ungleich glarus ag
(Being consistent)
|
2018-08-20 11:52:27 +02:00 |
|
PCoder
|
069cd18268
|
Add gdpr banner to all base templates
|
2018-07-21 13:27:15 +02:00 |
|
PCoder
|
4dce0ee5bd
|
Add gdpr banner to dcl template
|
2018-07-21 10:51:11 +02:00 |
|
PCoder
|
34ed51a643
|
Don't dissociate card if transaction fails
|
2018-07-07 02:03:42 +02:00 |
|
PCoder
|
8d42ca3200
|
Remove token parameter from stripe_utils.get_card_details
and add additional paramters to uniquely identify a card
|
2018-07-07 01:08:49 +02:00 |
|
PCoder
|
4c06a9e730
|
Add de translations by MalcolmA
|
2018-07-06 19:33:26 +02:00 |
|
PCoder
|
1f2743a65d
|
Makemessages for datacenterlight, hosting and utils
|
2018-07-06 01:19:44 +02:00 |
|
PCoder
|
0db4a113e6
|
Add some styles and do not let user remove card if he has only one
|
2018-07-05 23:06:47 +02:00 |
|
PCoder
|
5cd62abc70
|
Refactor code
|
2018-07-05 20:36:43 +02:00 |
|
PCoder
|
1e214f7b21
|
Improve comment
|
2018-07-05 20:35:34 +02:00 |
|
PCoder
|
6b663d82a1
|
Remove unused variable
|
2018-07-05 20:35:00 +02:00 |
|
PCoder
|
faa0604fae
|
Remove redundant code
|
2018-07-05 09:58:07 +02:00 |
|
PCoder
|
8d7b01d7e2
|
Disable dissociating card on subscription failure
|
2018-07-05 09:57:47 +02:00 |
|
PCoder
|
e9ac699be8
|
Add card detail creation code in various landing cases
|
2018-07-05 09:57:18 +02:00 |
|
PCoder
|
ec0216790f
|
Remove redundant code
|
2018-07-05 09:55:45 +02:00 |
|
PCoder
|
9bf8992ff4
|
Landing flow: set/get token/card_id
|
2018-07-04 02:53:43 +02:00 |
|
PCoder
|
dc28186fe9
|
Add styles for landing payment choices
|
2018-07-04 02:03:50 +02:00 |
|
PCoder
|
8e742852a5
|
Show all cards in landing and hosting payment page
|
2018-07-04 02:03:08 +02:00 |
|
PCoder
|
3d8237a34a
|
Get and show all card details in the landing flow, if the user is logged in
|
2018-07-04 00:50:44 +02:00 |
|
PCoder
|
1c5ff1f9dd
|
Add UserCardDetail in the landing non-logged in flow
|
2018-07-03 23:22:10 +02:00 |
|
PCoder
|
6d2b011925
|
Merge master into task/3747/multiple_cards_support
|
2018-07-03 21:29:04 +02:00 |
|
PCoder
|
44900f6a48
|
Rename OrderSpecifications to OrderDetail
|
2018-07-01 22:30:23 +02:00 |
|
PCoder
|
f48005166e
|
Fix bug getting VMTemplate object from vm_template_id
|
2018-07-01 18:42:11 +02:00 |
|
PCoder
|
900f014d92
|
Save order specifications in HostingOrder also
|
2018-07-01 18:33:10 +02:00 |
|
PCoder
|
5851277d9a
|
Reorganize imports
|
2018-07-01 16:36:41 +02:00 |
|
PCoder
|
43b3a63958
|
Reorganize imports
|
2018-07-01 16:25:02 +02:00 |
|
PCoder
|
081921e846
|
Merge master into task/3934/move_hosting_order_out_of_celery_task
|
2018-07-01 16:18:43 +02:00 |
|
PCoder
|
ef8e380ab7
|
Fix flake8 error
|
2018-07-01 11:22:42 +02:00 |
|
PCoder
|
c13af95017
|
Refactor code: get_primary_ip -> get_ipv6 and remove unwanted code
|
2018-07-01 11:07:39 +02:00 |
|
PCoder
|
8993a7bde1
|
Reorganize imports + format code
|
2018-07-01 11:05:23 +02:00 |
|
M.Ravi
|
f1e021e1e9
|
Improve comments
|
2018-06-27 12:24:53 +02:00 |
|
M.Ravi
|
88e6d9d216
|
Separate two error messages with a period
|
2018-06-27 12:24:16 +02:00 |
|
M.Ravi
|
2cd73b313a
|
Merge master into task/3934/move_hosting_order_out_of_celery_task
and resolve some conflicts
|
2018-06-27 12:09:05 +02:00 |
|
PCoder
|
a3db7f2e1a
|
Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6
|
2018-06-27 09:23:48 +02:00 |
|
PCoder
|
60260ccb08
|
Attempt to fix flake8 error
|
2018-06-27 09:06:28 +02:00 |
|
PCoder
|
6c2eabbe6a
|
Use the public ipv4 if it exists; otherwise use the ipv6 to do a
cdist cdist ssh configure
|
2018-06-27 00:01:55 +02:00 |
|
PCoder
|
70cac38f81
|
Move initialization of VMTemplates out of the plugin
|
2018-06-24 10:29:07 +02:00 |
|
PCoder
|
79e83b4480
|
Refactor show_vm_templates to DCLCalculatorPluginModel from VMPricing
|
2018-06-24 09:08:22 +02:00 |
|
PCoder
|
b872777bda
|
Filter context templates also by the ids that have been set for the calculator
|
2018-06-13 11:55:30 +02:00 |
|
PCoder
|
94f520be35
|
Add migration
|
2018-06-13 11:17:18 +02:00 |
|
PCoder
|
5748eecedb
|
Create field for storing os_templates_to_show
|
2018-06-13 11:16:49 +02:00 |
|
PCoder
|
cf00ff6bd8
|
Attempt to merge master into task/3747/multiple_cards_support
|
2018-06-12 08:16:11 +02:00 |
|
Arvind Tiwari
|
2d1805f11d
|
update fetchvmtemplates command
|
2018-05-24 04:14:53 +05:30 |
|
Arvind Tiwari
|
a4ca17e2ed
|
vm template prefix
|
2018-05-24 03:57:01 +05:30 |
|
Arvind Tiwari
|
8fb0d9a48a
|
order detail divider lines full width
|
2018-05-12 21:59:06 +05:30 |
|
Arvind Tiwari
|
3446dcc469
|
calculator translation
|
2018-05-12 21:48:57 +05:30 |
|
Arvind Tiwari
|
f39f95e1f7
|
remove template filter from translation
|
2018-05-12 03:47:54 +05:30 |
|
Arvind Tiwari
|
20f1df8a70
|
blocktrans variable fix
|
2018-05-12 03:39:38 +05:30 |
|
Arvind Tiwari
|
39f7898259
|
edit order detail footer text
|
2018-05-12 03:15:07 +05:30 |
|
Arvind Tiwari
|
55889499df
|
order detail style fix
|
2018-05-12 02:47:27 +05:30 |
|
Arvind Tiwari
|
8044e0c2a0
|
calculator discount text modified
|
2018-05-11 17:47:27 +05:30 |
|
Arvind Tiwari
|
30deae5a20
|
strong color fix
|
2018-05-11 17:25:44 +05:30 |
|
Arvind Tiwari
|
a14407182f
|
font weight for discount name
|
2018-05-11 17:21:02 +05:30 |
|
Arvind Tiwari
|
73e3dce8d4
|
order detail page font format
|
2018-05-11 17:18:19 +05:30 |
|
Arvind Tiwari
|
0fdb88b8aa
|
invoice discount amount fix
|
2018-05-07 07:50:32 +05:30 |
|
Arvind Tiwari
|
3d2ce27954
|
fix discount amount
|
2018-05-07 06:29:53 +05:30 |
|
Arvind Tiwari
|
eeed9b2e72
|
discount name in templates
|
2018-05-07 06:25:50 +05:30 |
|
Arvind Tiwari
|
2ff8c25034
|
exclude discount from total price
|
2018-05-07 06:11:44 +05:30 |
|
Arvind Tiwari
|
7a72cc02ab
|
translations
|
2018-05-07 05:22:05 +05:30 |
|
Arvind Tiwari
|
f8dc2c6bbe
|
discount option added to calculator
|
2018-05-07 05:07:58 +05:30 |
|
Arvind Tiwari
|
ccf55acbaf
|
Update navbar_dropdown.html
|
2018-05-01 04:36:29 +05:30 |
|
Arvind Tiwari
|
6ff03d8f48
|
Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages
Task/4527 dcl calculator on non-cms pages
|
2018-05-01 02:35:22 +05:30 |
|
Arvind Tiwari
|
86188b1fb0
|
Merge pull request #626 from tiwariav/task/4474/slider_padding
Task/4474 cms header slider padding
|
2018-04-30 23:52:23 +05:30 |
|
Arvind Tiwari
|
14548b2f01
|
flake8 refacoring
|
2018-04-25 17:26:31 +05:30 |
|
Arvind Tiwari
|
f66d768ecb
|
hosting payment page
|
2018-04-25 15:55:58 +05:30 |
|
Arvind Tiwari
|
3b3b73a2ce
|
alignment calculator plugin
|
2018-04-25 15:08:28 +05:30 |
|
Arvind Tiwari
|
3bf064a017
|
add calculator placeholder to cms_integration
|
2018-04-25 14:52:25 +05:30 |
|
Arvind Tiwari
|
a5bd8347e8
|
merged master
|
2018-04-21 21:01:42 +05:30 |
|
Arvind Tiwari
|
564f7a5be8
|
merge migrations
|
2018-04-20 20:36:28 +05:30 |
|
Arvind Tiwari
|
275ea47e41
|
merge master
|
2018-04-20 20:30:45 +05:30 |
|
Arvind Tiwari
|
71a37972d3
|
Merge remote-tracking branch 'ungleich/master'
|
2018-04-20 20:29:09 +05:30 |
|
Arvind Tiwari
|
736253feda
|
refactor imports
|
2018-04-20 20:27:26 +05:30 |
|
Arvind Tiwari
|
3debf34118
|
remove vm creation to util function
|
2018-04-20 20:25:24 +05:30 |
|
Arvind Tiwari
|
8f6260b063
|
Update _calculator_form.html
|
2018-04-20 17:54:23 +05:30 |
|
Arvind Tiwari
|
1e97d0ba38
|
Update cms_plugins.py
|
2018-04-20 17:51:46 +05:30 |
|
Arvind Tiwari
|
a25bcc807f
|
change header slider to container fluid
|
2018-04-20 17:04:02 +05:30 |
|
Arvind Tiwari
|
da13903ba2
|
remove padding
|
2018-04-20 16:42:50 +05:30 |
|
M.Ravi
|
fae1c7fbeb
|
Update hosting_order in a pythonic way
|
2018-04-19 07:26:34 +02:00 |
|
PCoder
|
80c3ac5346
|
Improve create_vm_task test
|
2018-04-19 01:09:25 +02:00 |
|
PCoder
|
a3a8227007
|
Check if subscription metadata update response does not have errors
|
2018-04-19 01:08:52 +02:00 |
|
PCoder
|
791f48513a
|
Organize imports
|
2018-04-19 01:07:59 +02:00 |
|
PCoder
|
8a659c153e
|
Set VM_ID metadata to the created subscription
|
2018-04-19 00:52:38 +02:00 |
|
PCoder
|
bd875ffe7d
|
Create hostingorder outside celery task
|
2018-04-18 23:50:52 +02:00 |
|
PCoder
|
4e3211b62f
|
Make total and subtotal texts bold
|
2018-04-18 21:37:12 +02:00 |
|
PCoder
|
4c21110c00
|
Remove fuzzy and python-format
|
2018-04-17 21:47:02 +02:00 |
|
PCoder
|
a454cd2522
|
Update datacenterlight's django.po
|
2018-04-17 21:38:53 +02:00 |
|
PCoder
|
c2513dc7c3
|
Show vat_percent and subtotal for vat exclusive case
|
2018-04-17 21:38:28 +02:00 |
|
PCoder
|
e4e7d93275
|
Fix flake8 errors
|
2018-04-17 20:50:41 +02:00 |
|
M.Ravi
|
d15a4da840
|
Check if child plugin instances exist before looping over them
|
2018-04-17 18:03:14 +02:00 |
|
PCoder
|
3fca9dbb0d
|
Fix a bug creating hostingorder
|
2018-04-16 05:03:48 +02:00 |
|
PCoder
|
b103772c0d
|
Pass vm_pricing if available when creating HostingOrder
|
2018-04-16 03:37:19 +02:00 |
|
PCoder
|
0b9c67166e
|
Rename variable name: disk_size -> ssd_size
|
2018-04-16 03:26:51 +02:00 |
|
PCoder
|
c5029d8752
|
Update datacenterlight's django.po
|
2018-04-16 01:48:39 +02:00 |
|
PCoder
|
95daa37670
|
Use total_price for amout to be charged, always
|
2018-04-16 01:32:38 +02:00 |
|
PCoder
|
4148eff03e
|
Rename variable: amount_to_be_charged -> price
|
2018-04-16 01:31:16 +02:00 |
|
PCoder
|
d0276f22c1
|
Reorganize imports
|
2018-04-16 01:30:02 +02:00 |
|
PCoder
|
1b37eed53d
|
Include pricing_name in the email sent to admin
|
2018-04-16 01:29:07 +02:00 |
|
PCoder
|
8e28756bd8
|
Check if we have total_price (indicates that we have VAT excluded
price);hence,use it as final_price. if not use the previous casei and use it as final_price. If not use the preivous case
|
2018-04-16 01:27:42 +02:00 |
|
PCoder
|
6d6a8ea597
|
Refactor: reuse final_price variable
|
2018-04-16 01:24:21 +02:00 |
|
PCoder
|
903336a46f
|
Show 2 upto decimal places in order detail
|
2018-04-16 00:59:42 +02:00 |
|
PCoder
|
ec753eb0d5
|
Improve string representation of VMPricing
|
2018-04-16 00:50:34 +02:00 |
|
PCoder
|
68032ec184
|
Update migration file
|
2018-04-16 00:49:55 +02:00 |
|
PCoder
|
1cb3fa80cf
|
Improve logger error
|
2018-04-16 00:29:43 +02:00 |
|
PCoder
|
896984ef1f
|
Set vm_pricing context from plugins value
|
2018-04-16 00:29:23 +02:00 |
|
PCoder
|
665fa7479b
|
Add 0019_auto_20180415_2129.py
|
2018-04-15 23:32:14 +02:00 |
|
PCoder
|
09a03783b7
|
Merge branch 'master' into task/4379/price_without_vat
|
2018-04-15 23:27:36 +02:00 |
|
PCoder
|
465431d858
|
Add DCLCustomPricingPlugin
|
2018-04-15 23:24:15 +02:00 |
|
PCoder
|
fc0bc52ea3
|
Rename model
DCLCalculatorPluginModel -> DCLCustomPricingModelModel
|
2018-04-15 23:19:18 +02:00 |
|
PCoder
|
6575ff1afe
|
Increase decimal_places for all VMPricing fields
|
2018-04-15 23:07:50 +02:00 |
|
PCoder
|
069ba34f94
|
Remove old migration file
|
2018-04-15 23:07:07 +02:00 |
|
PCoder
|
d296ce72cb
|
Register VMPricing with admin site
|
2018-04-15 21:37:51 +02:00 |
|
PCoder
|
40b984be15
|
Update order_detail landing template
|
2018-04-15 21:04:06 +02:00 |
|
PCoder
|
23bd0fa147
|
Pass context params to various landing templates
|
2018-04-15 21:03:31 +02:00 |
|
PCoder
|
962c96067f
|
Add get_vm_pricing_by_name VMPricing method
|
2018-04-15 20:55:39 +02:00 |
|
PCoder
|
63a12ffe06
|
Use updated get_vm_price method
|
2018-04-15 13:42:39 +02:00 |
|
PCoder
|
558e187e11
|
Update text: including/excluding VAT
|
2018-04-15 13:39:41 +02:00 |
|
PCoder
|
c738888ab2
|
Set vm unit price parameters from the passed context
|
2018-04-15 13:39:01 +02:00 |
|
PCoder
|
aa55c1e868
|
Update main.js to compute total from the unitprice's defined in the window context
|
2018-04-15 13:37:06 +02:00 |
|
PCoder
|
82a2014fa5
|
Pass vm_pricing context from default VMPricing object
|
2018-04-15 13:34:55 +02:00 |
|
PCoder
|
74393ac6ac
|
Optimize imports
|
2018-04-15 13:32:53 +02:00 |
|
Arvind Tiwari
|
00be159285
|
Merge pull request #621 from tiwariav/task/4376/cms_promo_section_link_color
Task/4376 cms promo link color
|
2018-04-13 18:44:51 +05:30 |
|
Arvind Tiwari
|
ca480ce9c8
|
darker shade for hover
|
2018-04-13 16:23:17 +05:30 |
|
Arvind Tiwari
|
479d6fbd4f
|
change promo link color
|
2018-04-13 15:45:06 +05:30 |
|
PCoder
|
0ea9051de1
|
Change the name of the DCL Calculator Plugin
DCL Caclulator Plugin -> DCL Calculator Section Plugin
Note: We do not change the plugin name itself because it causes
data loss
|
2018-04-12 08:38:14 +02:00 |
|
PCoder
|
3e1d5ba0e2
|
Improve string representation of VMPricing object
|
2018-04-12 08:03:19 +02:00 |
|
PCoder
|
d50f282057
|
Add create_vm_pricing management command
|
2018-04-12 08:01:43 +02:00 |
|
PCoder
|
588f513f2a
|
Remove initial VMPricing code from migration
|
2018-04-12 07:59:04 +02:00 |
|
Arvind Tiwari
|
c0c2dc5c37
|
larger image used in email
|
2018-04-12 09:26:30 +05:30 |
|
Arvind Tiwari
|
ebba6d3795
|
cms page extension favicon
|
2018-04-12 08:56:24 +05:30 |
|
PCoder
|
1116812a99
|
Correct hdd price in VMPricing init
|
2018-04-09 21:40:03 +02:00 |
|
PCoder
|
76c9b20cc9
|
Add VMPricing init migration
|
2018-04-09 21:34:09 +02:00 |
|
PCoder
|
4d6fdf2de9
|
Add DCLCalculatorPluginModel and VMPricing models
|
2018-04-09 21:32:53 +02:00 |
|
PCoder
|
b9d44b510f
|
Merge branch 'master' into task/4379/price_without_vat
|
2018-04-09 21:20:24 +02:00 |
|
PCoder
|
dd30542f9f
|
Use DCLCalculatorPluginModel in DCLCalculatorPlugin
|
2018-04-09 21:18:50 +02:00 |
|
PCoder
|
c7afbb32c0
|
Add DCLCalculatorPluginModel
|
2018-04-09 21:18:18 +02:00 |
|
PCoder
|
d07cc41d0a
|
Update VMPricing and add get_default_pricing class method
|
2018-04-09 21:17:48 +02:00 |
|
Arvind Tiwari
|
a7db7e05b0
|
Merge pull request #615 from tiwariav/bugfix/4427/fix_navbar_logo_repeat
bugfix/4427 fix navbar logo repeat
|
2018-04-09 03:27:29 +05:30 |
|
Arvind Tiwari
|
f30719f320
|
Merge pull request #613 from pcoder/bugfix/footer_links
Bugfix/footer links
|
2018-04-09 03:27:09 +05:30 |
|
Arvind Tiwari
|
6e95e3d885
|
merge master
|
2018-04-09 03:09:05 +05:30 |
|
Arvind Tiwari
|
ff1908d2e6
|
added navbar-transparent styles to glasfaser.css
|
2018-04-09 01:52:49 +05:30 |
|
Arvind Tiwari
|
fb7ccff584
|
remove old migrations from squashed migration
|
2018-04-09 01:11:45 +05:30 |
|
PCoder
|
30d7785700
|
Redirect to DCL home on hosting footer for all domains
|
2018-04-08 08:36:00 +02:00 |
|
PCoder
|
c3dff3155e
|
Redirect the contact link to dcl always
|
2018-04-08 00:29:39 +02:00 |
|
PCoder
|
178ff8da38
|
CMS home page can now be accessed at /cms/ for all sites
|
2018-04-07 13:13:55 +02:00 |
|
PCoder
|
c6e3963303
|
Update footer links in dcl _footer.html
|
2018-04-07 12:55:32 +02:00 |
|
PCoder
|
ffe4eb4123
|
Use REDIRECT_TO_CMS and MULTISITE_CMS_FALLBACK to construct
/hosting footer urls
|
2018-04-07 10:25:27 +02:00 |
|
PCoder
|
28de423a14
|
Add VMPricing model
|
2018-04-06 00:51:44 +02:00 |
|
Arvind Tiwari
|
35decd208c
|
merged master
|
2018-04-04 18:41:43 +05:30 |
|
Arvind Tiwari
|
7c13def3a2
|
header btn link fix
|
2018-04-04 17:55:19 +05:30 |
|
Arvind Tiwari
|
ae2dea993d
|
remove whitespace
|
2018-04-04 02:27:30 +05:30 |
|
Arvind Tiwari
|
fe3fcb5100
|
flake8 fix
|
2018-04-03 22:51:04 +05:30 |
|
Arvind Tiwari
|
d843c34d68
|
modified cms integrate to support separate content for each domain
|
2018-04-03 22:41:29 +05:30 |
|
Arvind Tiwari
|
1e6fb26051
|
hosting login footer fix
|
2018-04-01 18:45:36 +05:30 |
|
PCoder
|
fb29bd0128
|
[DCL] Add DE translations by Sanghee
|
2018-03-31 01:28:56 +02:00 |
|
PCoder
|
aa9becdfe7
|
Reduce space between content and your dcl team
|
2018-03-31 00:09:49 +02:00 |
|
PCoder
|
bf4f2f0f87
|
Correct a translation and add new translation
|
2018-03-30 23:47:27 +02:00 |
|
PCoder
|
07d15a8144
|
Include password reset link in the text
|
2018-03-30 23:46:29 +02:00 |
|
PCoder
|
74e69ff313
|
Add some space between account details and activate email linkpacebetween account details and activate email link
|
2018-03-30 23:45:11 +02:00 |
|
PCoder
|
b64fe2cb1c
|
Attempt to fix user activation html email template
|
2018-03-30 23:02:44 +02:00 |
|
Arvind Tiwari
|
141c6a7c0f
|
Update common.css
|
2018-03-29 01:24:18 +05:30 |
|
Arvind Tiwari
|
1402c7fde1
|
footer padding fix
|
2018-03-29 01:19:10 +05:30 |
|
Arvind Tiwari
|
368fe0d08f
|
merge master
|
2018-03-29 01:04:26 +05:30 |
|
Arvind Tiwari
|
29a2ee098b
|
fix related name for placeholder fields
|
2018-03-29 00:58:08 +05:30 |
|
Arvind Tiwari
|
2b27d56e54
|
cmsintegrate management command
|
2018-03-29 00:43:38 +05:30 |
|
Arvind Tiwari
|
8fc605f5b5
|
merge
|
2018-03-27 21:10:21 +05:30 |
|
Arvind Tiwari
|
e7d7cf67b2
|
add footer and header placeholders
|
2018-03-27 21:04:44 +05:30 |
|
Arvind Tiwari
|
d52c061709
|
use humanize to add comma to numbers
|
2018-03-27 19:38:09 +05:30 |
|
Arvind Tiwari
|
bc36849178
|
cms integration
|
2018-03-27 19:19:26 +05:30 |
|
Arvind Tiwari
|
52dafc99d3
|
ungleich gmbh -> ungleich glarus ag, settings page fix
|
2018-03-27 00:54:44 +05:30 |
|
Arvind Tiwari
|
880ee3af4a
|
padding fix for mobile
|
2018-03-25 22:16:46 +05:30 |
|
Arvind Tiwari
|
bd23d9462b
|
mobile font fix
|
2018-03-25 21:06:08 +05:30 |
|
Arvind Tiwari
|
412f1f1508
|
right section alignment fix
|
2018-03-25 21:01:59 +05:30 |
|
Arvind Tiwari
|
ee65c61f95
|
promo heading font size reduced for mobile
|
2018-03-25 20:49:19 +05:30 |
|
Arvind Tiwari
|
dfe47e43a2
|
lineheight fix and line break filter
|
2018-03-23 04:36:40 +05:30 |
|
Arvind Tiwari
|
3484b75d8b
|
calculaotr plugin allows child promo and html plugin
|
2018-03-23 03:22:29 +05:30 |
|
Arvind Tiwari
|
c3e83599a2
|
mobile side padding reduced
|
2018-03-23 02:54:24 +05:30 |
|
Arvind Tiwari
|
a1d01fd1ef
|
wide promo section text maxwidth
|
2018-03-23 01:47:03 +05:30 |
|
Arvind Tiwari
|
9a57c3341e
|
sectioniconplugin placement fix
|
2018-03-23 01:27:51 +05:30 |
|
Arvind Tiwari
|
414b783983
|
fix unreferenced migrations
|
2018-03-23 01:18:03 +05:30 |
|
Arvind Tiwari
|
d7fc4e686f
|
fix migrations
|
2018-03-23 01:17:09 +05:30 |
|
Arvind Tiwari
|
d74fdf9472
|
fix migrations
|
2018-03-23 01:14:57 +05:30 |
|
Arvind Tiwari
|
5e8f21c8e3
|
remove template tag
|
2018-03-23 01:07:53 +05:30 |
|
Arvind Tiwari
|
ef1f19d698
|
migrations
|
2018-03-23 00:54:34 +05:30 |
|
Arvind Tiwari
|
8a3ddda93e
|
promo section styling
|
2018-03-23 00:50:01 +05:30 |
|
Arvind Tiwari
|
d45f9076b5
|
Merge branch 'master' into task/4266/dcl_cms_promotion_section
|
2018-03-22 23:43:39 +05:30 |
|
Arvind Tiwari
|
a7193ee243
|
Update _navbar.html
removed from navbar
- why datacenterlight
- hightlights dropdown
changed contact url to absolute dcl cms landing page
|
2018-03-22 04:04:40 +05:30 |
|
Arvind Tiwari
|
adee93ca12
|
merge master
|
2018-03-22 03:49:06 +05:30 |
|
Arvind Tiwari
|
6c27e0e6ff
|
redirect form view instead of url
|
2018-03-22 03:30:43 +05:30 |
|
Arvind Tiwari
|
748a74f38b
|
redirect from static dcl landing to cms landing
|
2018-03-22 03:11:20 +05:30 |
|
Arvind Tiwari
|
f1a77d65c4
|
link target with absolute path on same page scrolls
|
2018-03-22 02:43:53 +05:30 |
|
Arvind Tiwari
|
50312db5f8
|
Merge remote-tracking branch 'ungleich/master' into bugfix/dcl_cms_plugins
|
2018-03-22 02:29:54 +05:30 |
|
Arvind Tiwari
|
102978f879
|
contact section heading
|
2018-03-22 02:29:32 +05:30 |
|
Arvind Tiwari
|
8f895a1d5a
|
Update contact.html
|
2018-03-22 01:59:45 +05:30 |
|
Arvind Tiwari
|
f9bedf20e0
|
Update navbar.html
change default url to `/` from `datacenterlight:index`
|
2018-03-22 01:18:21 +05:30 |
|
Arvind Tiwari
|
7ef37de084
|
Merge pull request #592 from tiwariav/bugfix/dcl_cms_section_iamge_caption
Bugfix/ dcl cms section image caption
|
2018-03-22 00:59:30 +05:30 |
|
Arvind Tiwari
|
049cf5afa2
|
fix dcl navbar link navigation
|
2018-03-22 00:52:59 +05:30 |
|
Arvind Tiwari
|
bbfb37dd8f
|
new plugins section
|
2018-03-22 00:52:06 +05:30 |
|
Arvind Tiwari
|
db99a40059
|
break long words to multiple lines
|
2018-03-21 22:26:43 +05:30 |
|
Arvind Tiwari
|
076aaac604
|
banner list item text set max-width
|
2018-03-21 00:57:03 +05:30 |
|
Arvind Tiwari
|
759b96f25c
|
banner list item text set max-width
|
2018-03-21 00:55:20 +05:30 |
|
Arvind Tiwari
|
39d67c84a1
|
fix lead text size
|
2018-03-21 00:46:22 +05:30 |
|
Arvind Tiwari
|
e29865b310
|
fix banner list image size, lead text size
|
2018-03-21 00:27:35 +05:30 |
|
Arvind Tiwari
|
b252211a69
|
header btn target accepts id, navbar optional lang dropdown
|
2018-03-20 02:34:20 +05:30 |
|
Arvind Tiwari
|
c7ff4423db
|
Update navbar.html
|
2018-03-17 13:12:26 +05:30 |
|
Arvind Tiwari
|
944946e59e
|
Update cms_models.py
|
2018-03-17 13:11:42 +05:30 |
|
Arvind Tiwari
|
6ae98b525d
|
Merge pull request #589 from tiwariav/task/dcl_cms_navbar_logo
bugfix/ navbar plugin model fix
|
2018-03-17 12:54:50 +05:30 |
|
Arvind Tiwari
|
07e7efd377
|
add related name to logo fields
|
2018-03-17 12:51:44 +05:30 |
|
Arvind Tiwari
|
3d52cab02b
|
Merge pull request #588 from tiwariav/task/dcl_cms_navbar_logo
Task/ dcl cms navbar logo
|
2018-03-17 12:36:43 +05:30 |
|
Arvind Tiwari
|
9b3b1d547e
|
fix header trans btn hover color
|
2018-03-16 23:56:45 +05:30 |
|
Arvind Tiwari
|
449683c72f
|
fix flake8 error
|
2018-03-16 23:50:33 +05:30 |
|
Arvind Tiwari
|
94d291da6d
|
model views refactor
|
2018-03-16 23:42:40 +05:30 |
|
Arvind Tiwari
|
648905421d
|
fix dcl dark logo
|
2018-03-16 23:36:02 +05:30 |
|
Arvind Tiwari
|
14b5d90514
|
dcl cms navbar logo
|
2018-03-16 15:29:24 +05:30 |
|
PCoder
|
c0c79ebf2b
|
Format code
|
2018-03-16 09:32:13 +01:00 |
|
PCoder
|
6baf989547
|
Replace strip with lstrip
|
2018-03-16 09:32:00 +01:00 |
|
Arvind Tiwari
|
4431ddf5ec
|
plugins change image and text order on mobile
|
2018-03-13 22:38:55 +05:30 |
|
Arvind Tiwari
|
776cd35172
|
heading font weight
|
2018-03-13 19:17:04 +05:30 |
|
Arvind Tiwari
|
b7af6ad4e6
|
headning font weight change
|
2018-03-13 03:03:28 +05:30 |
|
Arvind Tiwari
|
db3703bedc
|
ehading fix
|
2018-03-13 02:57:29 +05:30 |
|
Arvind Tiwari
|
6b67cb815c
|
reduce split-titlestyle speciicity
|
2018-03-13 02:55:55 +05:30 |
|
Arvind Tiwari
|
a29a151453
|
change font size
|
2018-03-13 02:34:39 +05:30 |
|
Arvind Tiwari
|
b9a1882080
|
fix style issues for dcl plugins
|
2018-03-13 01:52:54 +05:30 |
|
PCoder
|
44e913a744
|
Remove datacentelright_content placeholder conf
|
2018-03-11 21:24:24 +01:00 |
|
Arvind Tiwari
|
46b6fb44fa
|
add gradient to sections
|
2018-03-10 03:14:23 +05:30 |
|
Arvind Tiwari
|
835592c77f
|
Update landing-page.css
|
2018-03-10 02:49:42 +05:30 |
|
Arvind Tiwari
|
0260f955a0
|
Merge pull request #456 from tiwariav/task/3718/downtime_page
Task/3718 downtime page
|
2018-03-10 01:48:23 +05:30 |
|
Arvind Tiwari
|
b6888106e5
|
Merge pull request #579 from tiwariav/task/4119/dcl_cms_plugins
task/4119/dcl_cms_plugins
|
2018-03-10 00:07:05 +05:30 |
|
Arvind Tiwari
|
89c2d3f1ae
|
dcl cms base fix
|
2018-03-09 23:28:07 +05:30 |
|
Arvind Tiwari
|
eefe9ba940
|
company fiscal number added to hosting invoice footer
|
2018-03-09 03:47:18 +05:30 |
|
Arvind Tiwari
|
9e56857fc2
|
Merge branch 'task/4119/dcl_cms_plugins' of https://github.com/tiwariav/dynamicweb into task/4119/dcl_cms_plugins
|
2018-03-09 03:36:22 +05:30 |
|
Arvind Tiwari
|
82b8952595
|
removed unused tags from templated
|
2018-03-09 03:35:50 +05:30 |
|
PCoder
|
7cd563fe98
|
Merge remote-tracking branch 'tiwariav/task/4119/dcl_cms_plugins' into task/4119/dcl_cms_plugins
|
2018-03-08 19:57:05 +01:00 |
|
Arvind Tiwari
|
e7aa8e6139
|
undo url change
|
2018-03-07 19:27:50 +05:30 |
|
Arvind Tiwari
|
77843dd2cb
|
header font-weight fix, unused code removed
|
2018-03-06 03:23:14 +05:30 |
|
Arvind Tiwari
|
69de26fa22
|
mobile image size fix
|
2018-03-06 00:53:53 +05:30 |
|
Arvind Tiwari
|
fefa5cd5a6
|
image caption alignment
|
2018-03-06 00:48:31 +05:30 |
|
Arvind Tiwari
|
5ba5cb07aa
|
banner list alignment fix
|
2018-03-05 20:51:21 +05:30 |
|
Arvind Tiwari
|
ff635cb7e2
|
plain section image padding fix
|
2018-03-05 20:48:30 +05:30 |
|
Arvind Tiwari
|
b73d2529a2
|
image padding increased
|
2018-03-05 20:30:33 +05:30 |
|
Arvind Tiwari
|
4c5912ebc0
|
dropdown target fix
|
2018-03-05 20:00:31 +05:30 |
|
Arvind Tiwari
|
883118e050
|
whydcl section style fix, footer style fix
|
2018-03-05 18:41:13 +05:30 |
|
Pcoder
|
3d965effe5
|
Merge pull request #577 from ungleich/remove_beta_access
Remove some more beta access resources
|
2018-03-03 11:32:56 +01:00 |
|
Arvind Tiwari
|
a895f7caa7
|
squashed migrations
|
2018-03-02 02:13:20 +05:30 |
|
Arvind Tiwari
|
819848c90c
|
why dcl plugin and id for each section
|
2018-03-02 02:05:42 +05:30 |
|
Arvind Tiwari
|
b0192ceadb
|
style fix for section images
|
2018-03-01 01:38:56 +05:30 |
|
Arvind Tiwari
|
c3d8c7878f
|
add scroll to links
|
2018-03-01 00:32:21 +05:30 |
|
Arvind Tiwari
|
4759d4e1a5
|
section multi image style
|
2018-03-01 00:30:20 +05:30 |
|
Arvind Tiwari
|
84d01e16e7
|
header btn style fix
|
2018-03-01 00:22:51 +05:30 |
|
Arvind Tiwari
|
0f28b02350
|
migration fix
|
2018-02-28 20:52:20 +05:30 |
|
Arvind Tiwari
|
cca555e681
|
navbar dropdown style
|
2018-02-28 04:27:32 +05:30 |
|
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 |
|