Commit graph

996 commits

Author SHA1 Message Date
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
c9ac959ff6 Change DCLNavbarPlugin to show login option only if set 2018-09-25 22:29:58 +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
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
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