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
|
efae2b1d9a
|
Update Changelog
|
2018-09-26 21:17:35 +02:00 |
|
Pcoder
|
31e8467f20
|
Merge pull request #667 from pcoder/bugfix/corrections_by_malcolm
Bugfix/corrections by malcolm
- virutal -> virtual
- some DE corrections
|
2018-09-26 21:11:13 +02:00 |
|
PCoder
|
4feeec23d4
|
Correct spelling: virutal -> virtual
|
2018-09-26 20:50:19 +02:00 |
|
PCoder
|
ca578ecf56
|
Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master
|
2018-09-26 20:46:54 +02:00 |
|
PCoder
|
ce2ac4524c
|
Update Changelog for release 2.2.1
|
2018-09-25 22:49:31 +02:00 |
|
Pcoder
|
5d5408eb8c
|
Merge pull request #665 from pcoder/manage_navbar_login
Change DCLNavbarPlugin to show login option only if set
|
2018-09-25 22:43:10 +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
|
d7be223fcb
|
Change margin bottom for vm terminate error
|
2018-09-08 12:39:12 +02:00 |
|
PCoder
|
304feb4f7b
|
Update text
|
2018-09-08 10:46:07 +02:00 |
|
PCoder
|
e376f38baa
|
Correct text
|
2018-09-08 10:33:00 +02:00 |
|
PCoder
|
84dae63968
|
Fix: ugettext_lazy doesn't like string format
|
2018-09-08 10:29:47 +02:00 |
|
PCoder
|
4914280868
|
Set text for vm terminate timeout
|
2018-09-08 10:14:57 +02:00 |
|
PCoder
|
ce2d34350f
|
Update Changelog
|
2018-09-08 00:15:44 +02:00 |
|
Pcoder
|
743ce4ed70
|
Merge pull request #648 from pcoder/bugfix/log_vm_terminate_errors
Bugfix/log vm terminate errors
|
2018-09-08 00:09:59 +02:00 |
|
PCoder
|
a7afbec5b4
|
Fix flake8 error
|
2018-09-07 23:14:57 +02:00 |
|
PCoder
|
ff6df8cd58
|
Simplify logic
|
2018-09-07 23:11:46 +02:00 |
|
PCoder
|
7d4cf5c3c2
|
Fix flake8 error
|
2018-09-07 22:46:18 +02:00 |
|
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 |
|
Malcolm Anyakee
|
c891694dc0
|
Update Bugfix
Fixed bugs and fixed typo
|
2018-08-25 23:13:16 +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 |
|