Commit graph

4218 commits

Author SHA1 Message Date
PCoder
3796dabe11 Update Changelog 2018-08-24 11:30:49 +02:00
Pcoder
3de172adf2
Merge pull request #656 from pcoder/task/5487/warn_users_before_terminating_vm
Task/5487/warn users before terminating vm
2018-08-24 11:25:15 +02:00
PCoder
d7f171d710 Change DE translation (beenden instead of terminieren) 2018-08-24 11:07:50 +02:00
PCoder
4f745b607d Merge branch 'master' into task/5487/warn_users_before_terminating_vm 2018-08-24 10:58:24 +02:00
PCoder
9a5b9c7af5 Update Changelog 2018-08-24 10:05:37 +02:00
PCoder
4a16251a69 Update Changelog 2018-08-24 10:00:17 +02:00
Pcoder
fbfa6c8d21
Merge pull request #652 from pcoder/bugfix/send_email_on_dg_subscription
Send email to admin on dg subscription
2018-08-24 09:54:54 +02:00
PCoder
c458b56f71 Add migration file 2018-08-24 09:40:15 +02:00
PCoder
a45eef0409 Change cc_brand field to 128 chars 2018-08-24 09:37:56 +02:00
PCoder
83a6e53fae Merge branch 'master' into bugfix/send_email_on_dg_subscription 2018-08-24 08:42:25 +02:00
PCoder
feceb14aec Update Changelog 2018-08-23 19:55:30 +02:00
Pcoder
f1cc3c5892
Merge pull request #657 from pcoder/5458/make_hostingorder_readable
5458/make hostingorder readable
2018-08-23 19:50:17 +02:00
PCoder
e1263ce9b3 Add DE translation fo #5487 2018-08-23 19:40:16 +02:00
PCoder
4baa3a7095 Improve HostingOrder str representation 2018-08-23 09:18:55 +02:00
PCoder
4a1434c514 Make string representation of HostingOrder more readable 2018-08-23 09:07:12 +02:00
PCoder
f9584b4c82 Fix a bug when vm_template is None 2018-08-23 09:06:31 +02:00
PCoder
78e44332b5 Remove an unnecessary question mark 2018-08-22 23:16:26 +02:00
PCoder
af78631ec8 Update hosting's django.po 2018-08-22 23:13:49 +02:00
PCoder
29172a9df7 Use a separate class for warning block 2018-08-22 23:06:20 +02:00
PCoder
4425aa7c88 Change modal text 2018-08-22 22:57:32 +02:00
PCoder
b7ff519624 Reduce bottom padding further by 2px 2018-08-22 22:54:49 +02:00
PCoder
07837c8752 Reduce bottom padding 2018-08-22 22:51:22 +02:00
PCoder
1e5cf08273 Move the warning to the bottom 2018-08-22 22:47:49 +02:00
PCoder
7e790e7027 Add warning div 2018-08-22 22:36:29 +02:00
PCoder
929e7ead1c Add vm-terminate-warning style 2018-08-22 22:36:17 +02:00
PCoder
ab074d9bc2 Update Changelog 2018-08-22 22:00:43 +02:00
Pcoder
05d48ec4ff
Merge pull request #653 from pcoder/bugfix/show_meta_description_in_cms_page
Bugfix/show meta description in cms page (ungleich template)
2018-08-22 21:54:12 +02:00
PCoder
9c5363ef55 Merge branch 'master' into bugfix/show_meta_description_in_cms_page 2018-08-22 21:42:37 +02:00
PCoder
fb4591ef6a Update Changelog 2018-08-22 20:51:32 +02:00
Pcoder
438a6ab4e4
Merge pull request #655 from pcoder/task/5473/ping_before_cdist
Task/5473/ping before cdist
2018-08-22 20:45:00 +02:00
PCoder
432b54a86d Remove timeout parameter in ping6 request 2018-08-22 20:27:19 +02:00
PCoder
e66e8202db Remove unused variable 2018-08-22 19:56:56 +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
PCoder
cda6c60e02 Update Changelog for 2.1 2018-08-21 15:09:02 +02:00
Pcoder
873f44c6e5
Merge pull request #654 from pcoder/bugfix/long_cc_brand
Bugfix/long cc brand
2018-08-21 14:57:33 +02:00
PCoder
b69abf3edd Make CC brand 128 characters long 2018-08-21 14:42:01 +02:00
PCoder
8bf6440110 Delete old migrations 2018-08-21 14:41:16 +02:00
PCoder
768b8ca820 Change HostingOrder cc_brand field size to 35 chars 2018-08-21 14:06:58 +02:00
PCoder
770b5e080b Make UserCardDetail brand field 35 chars long 2018-08-21 13:24:54 +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
M.Ravi
e5fc87a971 Add description page_attribute for ungleich cms page template 2018-08-20 11:51:16 +02:00
PCoder
7b8301f143 Send email to admin on dg subscriptionon dg subscription 2018-08-10 21:19:12 +02:00
PCoder
051408e134 Update Changelog for 2.0.5 2018-08-08 00:26:00 +02:00
PCoder
29c4cc4454 Correct IPv6 VM name in serializer 2018-08-08 00:10:03 +02:00