Commit graph

4109 commits

Author SHA1 Message Date
PCoder
06d849c5ce Merge branch 'master' into 5151/gdpr_modal 2018-08-24 11:10:59 +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
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
e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +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
PCoder
895961868b Update Changelog for 2.0.4 2018-08-07 23:39:43 +02:00
Pcoder
ec2cef7ec5
Merge pull request #651 from pcoder/add_rss_feed_link
Add rss feed link
2018-08-07 23:27:44 +02:00
PCoder
e27317aeab Move rss icon from the header to the footer 2018-08-07 23:24:02 +02:00
PCoder
a8bf22a5b9 Merge branch 'master' into add_rss_feed_link 2018-08-07 22:41:15 +02:00
PCoder
5366745188 Update Changelog 2018-08-07 22:39:43 +02:00
Pcoder
8bce9c82a9
Merge pull request #650 from pcoder/bugfix/5293/change_to_terminate_hard
Bugfix/5293/Change VM terminate action from terminate to terminate hard
2018-08-07 22:29:57 +02:00
Pcoder
e16aab6951
Merge pull request #649 from pcoder/bug/5308/correct_ipv6_vm_name
Bug/5308/Correct IPv6 VM name
2018-08-07 22:28:37 +02:00
PCoder
48936ace51 Revert back commenting out unwanted templates
Todo in another pull request
2018-08-07 21:59:50 +02:00
PCoder
0a3f51361f Add RSS feed icon and link 2018-08-07 21:58:50 +02:00
PCoder
0ddbdb045f Remove unused CMS templates 2018-08-07 21:48:25 +02:00
PCoder
93d489334f Load cms_templates later
These templates are/were used in digitalglarus and hence are
obsolete now. Later can be removed after testing.
2018-08-07 21:44:57 +02:00
PCoder
6546814d62 Change VM terminate action from terminate to terminate hard 2018-08-04 09:52:42 +02:00