PCoder
|
8e7789462e
|
Merge branch 'master' into bugfix/log_vm_terminate_errors
|
2018-09-07 22:43:29 +02:00 |
|
PCoder
|
d601b987d2
|
Update Changelog
|
2018-09-06 01:15:21 +02:00 |
|
PCoder
|
c6ec2c062c
|
Update Changelog for 2.2
|
2018-09-06 01:11:27 +02:00 |
|
Pcoder
|
c6612153e8
|
Merge pull request #663 from pcoder/bugfix/plan-with-price
Use price in stripe plan name too
|
2018-09-06 01:04:47 +02:00 |
|
PCoder
|
fc8f9993af
|
Remove whitespace in Stripe plan
|
2018-09-06 00:52:55 +02:00 |
|
PCoder
|
b03cb073c2
|
Replace @ with a comma
|
2018-09-06 00:44:47 +02:00 |
|
PCoder
|
fdffe2389b
|
Round price
|
2018-09-06 00:31:17 +02:00 |
|
PCoder
|
d8a532e7b0
|
Round discount to 2 decimal points also
|
2018-09-06 00:26:08 +02:00 |
|
PCoder
|
642153345c
|
Round price, vat and discount to 2 decimal places
|
2018-09-06 00:18:04 +02:00 |
|
PCoder
|
8a30100488
|
Use price in stripe plan name too
|
2018-09-05 23:26:51 +02:00 |
|
PCoder
|
5f19a85a28
|
Update Changelog for 2.1.2
|
2018-08-30 10:10:31 +02:00 |
|
Pcoder
|
362a93a97f
|
Merge pull request #662 from pcoder/use_blog_feed
Set blog rss feed for all blog template
|
2018-08-30 09:57:36 +02:00 |
|
PCoder
|
4d4472f0d3
|
Set blog rss feed for all blog template
|
2018-08-30 09:47:29 +02:00 |
|
PCoder
|
23eb054422
|
Update Changelog for release 2.1.1
|
2018-08-24 12:23:01 +02:00 |
|
PCoder
|
144a780105
|
Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...'
|
2018-08-24 11:58:01 +02:00 |
|
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 |
|