Skip to content

Commit

Permalink
Remove meta_mixin references
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Apr 29, 2016
1 parent 4024a86 commit 335a12b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
10 changes: 7 additions & 3 deletions HISTORY.rst
Expand Up @@ -6,9 +6,13 @@ History
0.8.0 (unreleased)
++++++++++++++++++

* Add django-knocker integration
* Change the default value of date_published to null
* Clear menu cache when changing menu layout in apphook config
* Added django-knocker integration
* Changed the default value of date_published to null
* Cleared menu cache when changing menu layout in apphook config
* Fixed error with wizard multiple registration
* Made django CMS 3.2 the default version
* Fixed error with on_site filter
* Removed meta-mixin compatibility code

0.7.0 (2016-03-19)
++++++++++++++++++
Expand Down
4 changes: 2 additions & 2 deletions djangocms_blog/migrations/0001_initial.py
Expand Up @@ -5,7 +5,7 @@
import django.utils.timezone
import djangocms_text_ckeditor.fields
import filer.fields.image
import meta_mixin.models
import meta.models
import taggit_autosuggest.managers
from django.conf import settings
from django.db import migrations, models
Expand Down Expand Up @@ -106,7 +106,7 @@ class Migration(migrations.Migration):
'verbose_name': 'blog article',
'verbose_name_plural': 'blog articles',
},
bases=(meta_mixin.models.ModelMeta, models.Model),
bases=(meta.models.ModelMeta, models.Model),
),
migrations.CreateModel(
name='PostTranslation',
Expand Down
2 changes: 1 addition & 1 deletion djangocms_blog/models.py
Expand Up @@ -15,7 +15,7 @@
from django.utils.translation import get_language, ugettext_lazy as _
from djangocms_text_ckeditor.fields import HTMLField
from filer.fields.image import FilerImageField
from meta_mixin.models import ModelMeta
from meta.models import ModelMeta
from parler.models import TranslatableModel, TranslatedFields
from parler.utils.context import switch_language
from taggit_autosuggest.managers import TaggableManager
Expand Down
2 changes: 1 addition & 1 deletion djangocms_blog/settings.py
Expand Up @@ -10,7 +10,7 @@
def get_setting(name):
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from meta_mixin import settings as meta_settings
from meta import settings as meta_settings

PERMALINKS = (
('full_date', _('Full date')),
Expand Down
2 changes: 1 addition & 1 deletion djangocms_blog/templates/djangocms_blog/base.html
Expand Up @@ -2,7 +2,7 @@

{% block meta %}
{% if meta %}
{% include "meta_mixin/meta.html" %}
{% include "meta/meta.html" %}
{% endif %}
{% endblock meta %}

Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils/templates/blog.html
Expand Up @@ -5,7 +5,7 @@
<title>{% block title %}{% page_attribute 'title' %}{% endblock title %}</title>
{% render_block "css" %}
{% block canonical_url %}{% endblock canonical_url %}
{% include "meta_mixin/meta.html" %}
{% include "meta/meta.html" %}
<style type="text/css">
.nav {
padding-left: 0;
Expand Down

0 comments on commit 335a12b

Please sign in to comment.