ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'release/0.8.x' into develop

Browse source
This commit is contained in:
Iacopo Spalletti 2017-03-11 19:48:23 +01:00
commit c6e956cd65
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
11 changed files with 85 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
HISTORY.rst
View file

@ -22,6 +22,12 @@ History
* Improved admin filtering. * Improved admin filtering.
* Added featured date to post. * Added featured date to post.
*******************
0.8.12 (2017-03-11)
*******************
* Fixed migrations on Django 1.10
******************* *******************
0.8.11 (2017-03-04) 0.8.11 (2017-03-04)
******************* *******************

23
README.rst
View file

@ -67,23 +67,38 @@ Migrating cmsplugin-filer to 1.1 and djangocms-blog up to 0.8.4
If you have djangocms-blog up to 0.8.4 (included) installed or you are upgrading from a previous If you have djangocms-blog up to 0.8.4 (included) installed or you are upgrading from a previous
djangocms-blog version together with cmsplugin-filer upgrade, you can just apply the migrations:: djangocms-blog version together with cmsplugin-filer upgrade, you can just apply the migrations::
pip install cmsplugin-filer==1.1.1 django-filer==1.2.2 djangocms-blog==0.8.4 pip install cmsplugin-filer==1.1.3 django-filer==1.2.7 djangocms-blog==0.8.4
python manage.py migrate python manage.py migrate
Migrating cmsplugin-filer to 1.1 and djangocms-blog 0.8.5+ Migrating cmsplugin-filer to 1.1 and djangocms-blog 0.8.5+
========================================================== ==========================================================
If you already a djangocms-blog 0.8.5+ or above, you have to de-apply some blog migrations when If you already a djangocms-blog 0.8.5+ up to 0.8.11, upgrade to 0.8.11, then
doing the upgrade:: you have to de-apply some blog migrations when doing the upgrade::
pip install djangocms-blog==0.8.11
python manage.py migrate djangocms_blog 0017 ## reverse for these migration is a noop python manage.py migrate djangocms_blog 0017 ## reverse for these migration is a noop
pip install cmsplugin-filer==1.1.1 django-filer==1.2.2 pip install cmsplugin-filer==1.1.3 django-filer==1.2.7
python manage.py migrate python manage.py migrate
After this step you can upgrade to 0.8.12::
pip install djangocms-blog==0.8.12
.. note:: de-apply migration **before** upgrading cmsplugin-filer. If running before upgrade, the .. note:: de-apply migration **before** upgrading cmsplugin-filer. If running before upgrade, the
backward migration won't alter anything on the database, and it will just allow the code backward migration won't alter anything on the database, and it will just allow the code
to migrate ``ThumbnailOption`` from cmsplugin-filer to filer to migrate ``ThumbnailOption`` from cmsplugin-filer to filer
.. note:: If you upgrade in a Django 1.10 environment, be sure to upgrade both packages
at the same time to allow correct migration dependencies to be evaluated.
Installing djangocms-blog in an existing project with Django 1.10
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
If your project has cmsplugin-filer 1.1+ already installed and it uses Django 1.10,
install djangocms-blog 0.8.12 (and above)::
pip install djangocms-blog==0.8.12
******** ********
Features Features

2
djangocms_blog/__init__.py
View file

@ -3,6 +3,6 @@ from __future__ import absolute_import, print_function, unicode_literals
__author__ = 'Iacopo Spalletti' __author__ = 'Iacopo Spalletti'
__email__ = 'i.spalletti@nephila.it' __email__ = 'i.spalletti@nephila.it'
__version__ = '0.9b8' __version__ = '0.9b9'
default_app_config = 'djangocms_blog.apps.BlogAppConfig' default_app_config = 'djangocms_blog.apps.BlogAppConfig'

BIN
djangocms_blog/locale/de/LC_MESSAGES/django.mo
View file

Binary file not shown.

60
djangocms_blog/locale/de/LC_MESSAGES/django.po
View file

@ -5,14 +5,14 @@
# Translators: # Translators:
# Christoph Reimers <christoph@superservice-international.com>, 2014 # Christoph Reimers <christoph@superservice-international.com>, 2014
# fsbraun <fsbraun@gmx.de>, 2016 # fsbraun <fsbraun@gmx.de>, 2016
# fsbraun <fsbraun@gmx.de>, 2016 # fsbraun <fsbraun@gmx.de>, 2016-2017
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: djangocms-blog\n" "Project-Id-Version: djangocms-blog\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-04 16:35+0100\n" "POT-Creation-Date: 2017-03-04 16:35+0100\n"
"PO-Revision-Date: 2017-03-04 15:35+0000\n" "PO-Revision-Date: 2017-03-06 20:01+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n" "Last-Translator: fsbraun <fsbraun@gmx.de>\n"
"Language-Team: German (http://www.transifex.com/nephila/djangocms-blog/language/de/)\n" "Language-Team: German (http://www.transifex.com/nephila/djangocms-blog/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -23,39 +23,39 @@ msgstr ""
#: admin.py:34 #: admin.py:34
msgid "site" msgid "site"
msgstr "" msgstr "Web-Site"
#: admin.py:91 #: admin.py:91
msgid "Info" msgid "Info"
msgstr "" msgstr "Informationen"
#: admin.py:97 #: admin.py:97
msgid "Images" msgid "Images"
msgstr "" msgstr "Beitragsbild"
#: admin.py:101 #: admin.py:101
msgid "SEO" msgid "SEO"
msgstr "" msgstr "SEO"
#: admin.py:305 #: admin.py:305
msgid "Generic" msgid "Generic"
msgstr "" msgstr "Generisch"
#: admin.py:311 #: admin.py:311
msgid "Layout" msgid "Layout"
msgstr "" msgstr "Layout"
#: admin.py:318 #: admin.py:318
msgid "Notifications" msgid "Notifications"
msgstr "" msgstr "Benachrichtigungen"
#: admin.py:324 #: admin.py:324
msgid "Sitemap" msgid "Sitemap"
msgstr "" msgstr "Sitemap"
#: admin.py:330 #: admin.py:330
msgid "Meta" msgid "Meta"
msgstr "" msgstr "Meta-Informationen"
#: admin.py:341 admin.py:349 admin.py:357 #: admin.py:341 admin.py:349 admin.py:357
msgid "You can provide plain strings, Post model attribute or method names" msgid "You can provide plain strings, Post model attribute or method names"
@ -135,11 +135,11 @@ msgstr "Aufbau des Django CMS-Menü"
#: cms_appconfig.py:70 #: cms_appconfig.py:70
msgid "Show empty categories in menu" msgid "Show empty categories in menu"
msgstr "" msgstr "Leere Kategorien im Menü anzeigen"
#: cms_appconfig.py:72 #: cms_appconfig.py:72
msgid "Show categories with no post attached in the menu" msgid "Show categories with no post attached in the menu"
msgstr "" msgstr "Auch Kategorien im Menü anzeigen, zu denen es keine Beiträge gibt"
#: cms_appconfig.py:75 #: cms_appconfig.py:75
msgid "Sitemap changefreq" msgid "Sitemap changefreq"
@ -268,27 +268,27 @@ msgstr "Blog-Beträge auf %(site_name)s"
#: liveblog/apps.py:10 #: liveblog/apps.py:10
msgid "Liveblog" msgid "Liveblog"
msgstr "" msgstr "Liveblog"
#: liveblog/cms_plugins.py:15 #: liveblog/cms_plugins.py:15
msgid "Liveblog item" msgid "Liveblog item"
msgstr "" msgstr "Liveblog-Meldung"
#: liveblog/models.py:29 #: liveblog/models.py:29
msgid "publish liveblog entry" msgid "publish liveblog entry"
msgstr "" msgstr "Liveblog-Meldung veröffentlichen"
#: liveblog/models.py:30 #: liveblog/models.py:30
msgid "post date" msgid "post date"
msgstr "" msgstr "Veröffentlichungsdatum"
#: liveblog/models.py:33 liveblog/models.py:108 #: liveblog/models.py:33 liveblog/models.py:108
msgid "liveblog entry" msgid "liveblog entry"
msgstr "" msgstr "Liveblog-Meldung"
#: liveblog/models.py:34 liveblog/models.py:109 #: liveblog/models.py:34 liveblog/models.py:109
msgid "liveblog entries" msgid "liveblog entries"
msgstr "" msgstr "Liveblog-Meldungen"
#: liveblog/models.py:97 models.py:173 #: liveblog/models.py:97 models.py:173
msgid "title" msgid "title"
@ -296,11 +296,11 @@ msgstr "Titel"
#: liveblog/models.py:99 #: liveblog/models.py:99
msgid "image" msgid "image"
msgstr "" msgstr "Beitragsbild"
#: liveblog/models.py:103 #: liveblog/models.py:103
msgid "thumbnail size" msgid "thumbnail size"
msgstr "" msgstr "Vorschau-Größe"
#: models.py:64 #: models.py:64
msgid "parent" msgid "parent"
@ -356,7 +356,7 @@ msgstr "öffentlich bis"
#: models.py:145 #: models.py:145
msgid "featured date" msgid "featured date"
msgstr "" msgstr "Vorstellungs-Datum"
#: models.py:146 #: models.py:146
msgid "publish" msgid "publish"
@ -418,7 +418,7 @@ msgstr "Text"
#: models.py:189 #: models.py:189
msgid "enable liveblog on post" msgid "enable liveblog on post"
msgstr "" msgstr "Liveblog für Beitrag aktivieren"
#: models.py:223 #: models.py:223
msgid "blog article" msgid "blog article"
@ -430,19 +430,19 @@ msgstr "Blog-Beiträge"
#: models.py:399 #: models.py:399
msgid "current site" msgid "current site"
msgstr "" msgstr "Aktuelle Web-Site"
#: models.py:399 #: models.py:399
msgid "Select items from the current site only" msgid "Select items from the current site only"
msgstr "" msgstr "Nur Einträge der aktuelle Web-Site zulassen"
#: models.py:403 #: models.py:403
msgid "Plugin template" msgid "Plugin template"
msgstr "" msgstr "Plugin-Vorlage"
#: models.py:404 #: models.py:404
msgid "Select plugin template to load for this instance" msgid "Select plugin template to load for this instance"
msgstr "" msgstr "Wählen Sie die Vorlage für diese Instanz des Plugins"
#: models.py:438 models.py:474 #: models.py:438 models.py:474
msgid "articles" msgid "articles"
@ -556,7 +556,7 @@ msgstr "Letzte Blog-Beiträge"
#: settings.py:119 #: settings.py:119
msgid "Latest Blog Articles - Cache" msgid "Latest Blog Articles - Cache"
msgstr "" msgstr "Letzte Blog-Einträge (Cache)"
#: settings.py:121 #: settings.py:121
msgid "Author Blog Articles" msgid "Author Blog Articles"
@ -577,7 +577,7 @@ msgstr "Archiv"
#: settings.py:140 #: settings.py:140
msgid "Default template" msgid "Default template"
msgstr "" msgstr "Standard-Vorlage"
#: templates/djangocms_blog/includes/blog_item.html:24 #: templates/djangocms_blog/includes/blog_item.html:24
msgid "read more" msgid "read more"

BIN
djangocms_blog/locale/lt/LC_MESSAGES/django.mo
View file

Binary file not shown.

58
djangocms_blog/locale/lt/LC_MESSAGES/django.po
View file

@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: djangocms-blog\n" "Project-Id-Version: djangocms-blog\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-04 16:35+0100\n" "POT-Creation-Date: 2017-03-04 16:35+0100\n"
"PO-Revision-Date: 2017-03-04 15:35+0000\n" "PO-Revision-Date: 2017-03-06 11:06+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n" "Last-Translator: Matas Dailyda <matas@dailyda.com>\n"
"Language-Team: Lithuanian (http://www.transifex.com/nephila/djangocms-blog/language/lt/)\n" "Language-Team: Lithuanian (http://www.transifex.com/nephila/djangocms-blog/language/lt/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -21,39 +21,39 @@ msgstr ""
#: admin.py:34 #: admin.py:34
msgid "site" msgid "site"
msgstr "" msgstr "tinklalapis"
#: admin.py:91 #: admin.py:91
msgid "Info" msgid "Info"
msgstr "" msgstr "Informacija"
#: admin.py:97 #: admin.py:97
msgid "Images" msgid "Images"
msgstr "" msgstr "Paveikslėliai"
#: admin.py:101 #: admin.py:101
msgid "SEO" msgid "SEO"
msgstr "" msgstr "SEO"
#: admin.py:305 #: admin.py:305
msgid "Generic" msgid "Generic"
msgstr "" msgstr "Bendras"
#: admin.py:311 #: admin.py:311
msgid "Layout" msgid "Layout"
msgstr "" msgstr "Išdėstymas"
#: admin.py:318 #: admin.py:318
msgid "Notifications" msgid "Notifications"
msgstr "" msgstr "Pranešimai"
#: admin.py:324 #: admin.py:324
msgid "Sitemap" msgid "Sitemap"
msgstr "" msgstr "Tinklalapio žemėlapis"
#: admin.py:330 #: admin.py:330
msgid "Meta" msgid "Meta"
msgstr "" msgstr "Meta"
#: admin.py:341 admin.py:349 admin.py:357 #: admin.py:341 admin.py:349 admin.py:357
msgid "You can provide plain strings, Post model attribute or method names" msgid "You can provide plain strings, Post model attribute or method names"
@ -133,11 +133,11 @@ msgstr "Django CMS meniu struktūra"
#: cms_appconfig.py:70 #: cms_appconfig.py:70
msgid "Show empty categories in menu" msgid "Show empty categories in menu"
msgstr "" msgstr "Rodyti tuščias kategorijas meniu"
#: cms_appconfig.py:72 #: cms_appconfig.py:72
msgid "Show categories with no post attached in the menu" msgid "Show categories with no post attached in the menu"
msgstr "" msgstr "Rodyti kategorijas be susietų straipsnių meniu"
#: cms_appconfig.py:75 #: cms_appconfig.py:75
msgid "Sitemap changefreq" msgid "Sitemap changefreq"
@ -266,27 +266,27 @@ msgstr "Tinklaraščio straipsniai %(site_name)s"
#: liveblog/apps.py:10 #: liveblog/apps.py:10
msgid "Liveblog" msgid "Liveblog"
msgstr "" msgstr "Gyvas tinklaraštis"
#: liveblog/cms_plugins.py:15 #: liveblog/cms_plugins.py:15
msgid "Liveblog item" msgid "Liveblog item"
msgstr "" msgstr "Gyvo tinklaraščio objektas"
#: liveblog/models.py:29 #: liveblog/models.py:29
msgid "publish liveblog entry" msgid "publish liveblog entry"
msgstr "" msgstr "publikuoti gyvo tinklaraščio įrašą"
#: liveblog/models.py:30 #: liveblog/models.py:30
msgid "post date" msgid "post date"
msgstr "" msgstr "publikavimo data"
#: liveblog/models.py:33 liveblog/models.py:108 #: liveblog/models.py:33 liveblog/models.py:108
msgid "liveblog entry" msgid "liveblog entry"
msgstr "" msgstr "gyvo tinklaraščio įrašas"
#: liveblog/models.py:34 liveblog/models.py:109 #: liveblog/models.py:34 liveblog/models.py:109
msgid "liveblog entries" msgid "liveblog entries"
msgstr "" msgstr "gyvo tinklaraščio įrašai"
#: liveblog/models.py:97 models.py:173 #: liveblog/models.py:97 models.py:173
msgid "title" msgid "title"
@ -294,11 +294,11 @@ msgstr "pavadinimas"
#: liveblog/models.py:99 #: liveblog/models.py:99
msgid "image" msgid "image"
msgstr "" msgstr "paveikslėlis"
#: liveblog/models.py:103 #: liveblog/models.py:103
msgid "thumbnail size" msgid "thumbnail size"
msgstr "" msgstr "piktogramos dydis"
#: models.py:64 #: models.py:64
msgid "parent" msgid "parent"
@ -354,7 +354,7 @@ msgstr "publikuota iki"
#: models.py:145 #: models.py:145
msgid "featured date" msgid "featured date"
msgstr "" msgstr "populiarinimo data"
#: models.py:146 #: models.py:146
msgid "publish" msgid "publish"
@ -416,7 +416,7 @@ msgstr "tekstas"
#: models.py:189 #: models.py:189
msgid "enable liveblog on post" msgid "enable liveblog on post"
msgstr "" msgstr "įgalinti gyvą tinklaraštį šiame straipsnyje"
#: models.py:223 #: models.py:223
msgid "blog article" msgid "blog article"
@ -428,19 +428,19 @@ msgstr "tinklaraščio straipsniai"
#: models.py:399 #: models.py:399
msgid "current site" msgid "current site"
msgstr "" msgstr "dabartinis tinklalapis"
#: models.py:399 #: models.py:399
msgid "Select items from the current site only" msgid "Select items from the current site only"
msgstr "" msgstr "Pasirinkti objektus tik iš dabartinio tinklalapio"
#: models.py:403 #: models.py:403
msgid "Plugin template" msgid "Plugin template"
msgstr "" msgstr "Įskiepio šablonas"
#: models.py:404 #: models.py:404
msgid "Select plugin template to load for this instance" msgid "Select plugin template to load for this instance"
msgstr "" msgstr "Pasirinkite įskiepio šabloną kuris bus kraunamas šiam atvejui"
#: models.py:438 models.py:474 #: models.py:438 models.py:474
msgid "articles" msgid "articles"
@ -554,7 +554,7 @@ msgstr "Naujausi tinklaraščio straipsniai"
#: settings.py:119 #: settings.py:119
msgid "Latest Blog Articles - Cache" msgid "Latest Blog Articles - Cache"
msgstr "" msgstr "Paskutiniai tinklaraščio straipsniai - kešas"
#: settings.py:121 #: settings.py:121
msgid "Author Blog Articles" msgid "Author Blog Articles"
@ -575,7 +575,7 @@ msgstr "Archyvas"
#: settings.py:140 #: settings.py:140
msgid "Default template" msgid "Default template"
msgstr "" msgstr "Numatytasis šablonas"
#: templates/djangocms_blog/includes/blog_item.html:24 #: templates/djangocms_blog/includes/blog_item.html:24
msgid "read more" msgid "read more"

3
djangocms_blog/migrations/0017_thumbnail_move.py
View file

@ -13,9 +13,6 @@ class Migration(migrations.Migration):
('filer', '0003_thumbnailoption'), ('filer', '0003_thumbnailoption'),
('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'), ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
] ]
run_before = [
('cmsplugin_filer_image', '0004_auto_20160120_0950'),
]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(

5
djangocms_blog/migrations/0018_thumbnail_move2.py
View file

@ -10,11 +10,6 @@ class Migration(migrations.Migration):
if 'cmsplugin_filer' not in thumbnail_model: if 'cmsplugin_filer' not in thumbnail_model:
dependencies = [ dependencies = [
('djangocms_blog', '0017_thumbnail_move'), ('djangocms_blog', '0017_thumbnail_move'),
('filer', '0003_thumbnailoption'),
('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
]
run_before = [
('cmsplugin_filer_image', '0004_auto_20160120_0950'),
] ]
operations = [ operations = [

5
djangocms_blog/migrations/0019_thumbnail_move3.py
View file

@ -25,11 +25,6 @@ class Migration(migrations.Migration):
if 'cmsplugin_filer' not in thumbnail_model: if 'cmsplugin_filer' not in thumbnail_model:
dependencies = [ dependencies = [
('djangocms_blog', '0018_thumbnail_move2'), ('djangocms_blog', '0018_thumbnail_move2'),
('filer', '0003_thumbnailoption'),
('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
]
run_before = [
('cmsplugin_filer_image', '0004_auto_20160120_0950'),
] ]
operations = [ operations = [

5
djangocms_blog/migrations/0020_thumbnail_move4.py
View file

@ -10,11 +10,6 @@ class Migration(migrations.Migration):
if 'cmsplugin_filer' not in thumbnail_model: if 'cmsplugin_filer' not in thumbnail_model:
dependencies = [ dependencies = [
('djangocms_blog', '0019_thumbnail_move3'), ('djangocms_blog', '0019_thumbnail_move3'),
('filer', '0003_thumbnailoption'),
('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'),
]
run_before = [
('cmsplugin_filer_image', '0004_auto_20160120_0950'),
] ]
operations = [ operations = [