PCoder
6b8ecd7c9b
Merge branch 'remove-maxcdn-dependency'
2019-05-05 21:17:56 +02:00
PCoder
05786418e4
Update Changelog for 2.5.7
2019-05-05 21:16:12 +02:00
5073b35205
Merge branch 'remove-maxcdn-dependency' into 'master'
...
Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies
See merge request ungleich-public/dynamicweb!700
2019-05-05 21:05:32 +02:00
PCoder
e6ff78b37d
Correct the contents of font-awesome-4.1.0 min css file
2019-05-05 20:49:16 +02:00
PCoder
f8768e8a8a
Fix font-awesome css file location
2019-05-05 20:34:13 +02:00
PCoder
d91a403680
Add bootstrap-3.3.4 local resources
2019-05-05 20:24:47 +02:00
PCoder
dca11c1b26
Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies
...
Use local resources instead
2019-05-05 20:23:02 +02:00
PCoder
2b99ac1670
Add html5shiv-3.7.0.js, jquery-1.11.1.min.js, respond-1.4.2.min.js
2019-05-05 20:21:19 +02:00
PCoder
43e6383342
Update Changelog for 2.5.6
2019-05-05 17:45:43 +02:00
PCoder
3b41f2a149
Check if the page is IPv6.Blog and load header img accordingly
2019-05-05 17:42:15 +02:00
PCoder
2b118ff540
Correct spelling
2019-05-05 16:56:56 +02:00
PCoder
b629ad5105
Merge branch 'master' into feature/delete-user
2019-05-05 13:52:06 +02:00
PCoder
829261af88
Revert back djangocms-blog version to 0.9.0
2019-05-05 13:42:09 +02:00
PCoder
498418c669
Remove header block that causes the blog title to appear
2019-05-04 14:35:52 +02:00
PCoder
87ef84e981
Update Changelog for 2.5.5
2019-05-04 14:13:11 +02:00
83ce6e82eb
Merge branch 'bugfix/remove-category-string' into 'master'
...
Use the modified djangocms_blog module to remove Category - blah ...
See merge request ungleich-public/dynamicweb!699
2019-05-04 14:07:45 +02:00
PCoder
167ce9e4c1
Use the modified djangocms_blog module to remove Category - blah ...
2019-05-04 13:20:13 +02:00
PCoder
532b7dee9e
Update Changelog for 2.5.4
2019-05-04 12:49:06 +02:00
c7ebcb00cd
Merge branch 'feature/blog-by-category' into 'master'
...
Set the title and header via GET params
See merge request ungleich-public/dynamicweb!698
2019-05-04 12:44:32 +02:00
PCoder
3afa969206
Set the title and header via GET params
2019-05-04 09:40:09 +02:00
PCoder
51100fd627
Add missing code
2019-04-29 00:53:06 +02:00
PCoder
0352096fa7
Call delete on Customer object
2019-04-29 00:17:59 +02:00
PCoder
a67284a89d
Rename management command deteteuser -> deleteuser
2019-04-29 00:02:45 +02:00
PCoder
591614ade5
Remove user from opennebula also
2019-04-28 23:57:39 +02:00
PCoder
c8bd3f97c6
Add deleteuser management command
2019-04-28 23:14:14 +02:00
PCoder
71d1e6e3c9
Add delete method for UserHostingKey
2019-04-28 23:13:54 +02:00
PCoder
1ccb4e9790
Correct the way we get periods for invoices list
2019-04-22 11:40:00 +02:00
PCoder
965cc3adf9
Show correct period start and period end in invoice list
...
Previously, we used to take the first element in the bill line
item, for invoice start and end date. However, it can be faulty in
cases where the first item does not represent a VM itself (which
we are sure has a monthly subscription and a correct start and end
dates)
2019-04-22 11:08:59 +02:00
PCoder
a5188a7ab0
Update Changelog for 2.5.3
2019-04-20 20:00:40 +02:00
PCoder
3a7c209b80
Fallback to Stripe plan name for product description if its set
2019-04-20 19:54:46 +02:00
PCoder
212648a1c5
Merge branch 'feature/6561/show-multiple-line-items'
2019-04-20 19:14:41 +02:00
PCoder
dad4f42dc3
Do not add vm_conf to details if it is None
2019-04-20 19:13:34 +02:00
3c4494f35c
Merge branch 'feature/6561/show-multiple-line-items' into 'master'
...
Feature/6561/show multiple line items
See merge request ungleich-public/dynamicweb!697
2019-04-20 19:00:09 +02:00
PCoder
21eb88ef62
Add get_vm_config_from_stripe_id stripe util function
2019-04-20 18:53:20 +02:00
PCoder
0b99a0cbec
Fix getting users email and password from the request object
2019-04-20 18:52:34 +02:00
PCoder
a1a85e6c18
Style the invoice detail page for multiline items
2019-04-20 18:52:01 +02:00
PCoder
2ae0c8629b
Add CSS styles for multi line invoice table
2019-04-20 18:51:23 +02:00
PCoder
a811e9f83d
Add helper methods in HostingBillLineItem
2019-04-20 18:50:46 +02:00
PCoder
e782d27739
Attempt to show relevant lines when we have more than 1 line item
2019-04-20 15:20:55 +02:00
PCoder
3fbc4528d9
Merge branch 'feature/6561/link-billlineitem-with-stripeplan'
2019-04-20 14:13:47 +02:00
PCoder
aff197c1b5
Fix getting StripePlan by plan_id and not name
2019-04-20 14:12:45 +02:00
c0c938e65c
Merge branch 'feature/6561/link-billlineitem-with-stripeplan' into 'master'
...
Feature/6561/link billlineitem with stripeplan
See merge request ungleich-public/dynamicweb!696
2019-04-20 13:56:05 +02:00
PCoder
c592c0768e
Extract stripe plan from invoice and set it to MHB
...
If the plan does not exist, it implies that it was created in the
dashboard. So, we create it in the backend also.
2019-04-20 12:48:18 +02:00
PCoder
38d074811a
Link HostingBillLineItem to StripePlan
2019-04-20 12:41:30 +02:00
PCoder
c8e35e63f0
Update datacenterlight StripePlan further
...
- Add field amount to stripeplan
- Add field interval to stripeplan
2019-04-20 12:22:51 +02:00
PCoder
4be098d07a
Add stripe_plan_name field to datacenterlight's StripePlan model
2019-04-20 11:55:47 +02:00
PCoder
44ffd042a6
Obtain vm_id from multiple line items
...
- Remove empty string from VM_IDs string
- If more than one is present, check all of them are the same
If same return, the unique value
Else return none, as we don't handle this case
2019-04-20 10:00:53 +02:00
PCoder
9f13253475
Add missing braces
2019-04-20 09:49:26 +02:00
PCoder
ecfec9dd21
Handle invoice item in line items also
2019-04-20 08:57:13 +02:00
PCoder
0a22ced19c
Update Changelog for 2.5.2
2019-04-20 07:47:27 +02:00