Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/1470715 into lp:developer-ubuntu-com

[Daniel Holbach]

Migration notes:
 - Use lp:developer-ubuntu-com as a basis, if it's not an instance with live data, make sure you've run all steps from README.md

 - Run:
   ./env/bin/python manage.py cms delete_orphaned_plugins
   ./env/bin/python manage.py cms fix-mptt

 - merge this branch

 - Run:
   make update-1470715
   ./env/bin/python manage.py runserver

[Daniel Holbach (dholbach)]

Ok, this might need some work if we fully plan to move off of mptt - where is templates/zinnia/category_list.html used?

daniel@daydream:~/dev/sites/developer-ubuntu-com$ bzr grep mptt
developer_portal/settings.py: 'mptt', #utilities for implementing a modified pre-order traversal tree
requirements.txt:django-mptt==0.6.1
templates/zinnia/category_list.html:{% load i18n mptt_tags %}
daniel@daydream:~/dev/sites/developer-ubuntu-com$

review: Needs Information

[Michael Hall (mhall119)]

> Ok, this might need some work if we fully plan to move off of mptt - where is
> templates/zinnia/category_list.html used?
>

I believe it's used here: https://developer.ubuntu.com/en/blog/categories/

[Daniel Holbach (dholbach)]

I removed the mptt references, they're not required for our app. zinnia still uses mptt internally though.

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/1470715]

163. By Daniel Holbach on 2015-11-02

merged trunk

164. By David Callé on 2015-11-02

Fix importer commands

165. By David Callé on 2015-11-02

Fix diverged branches

166. By Daniel Holbach on 2015-11-02

update various packages

167. By Daniel Holbach on 2015-11-02

django 1.8.6 is not on pypi yet

168. By Daniel Holbach on 2015-11-02

fix djangocms_link migrations path

169. By Daniel Holbach on 2015-11-02

@transaction.commit_on_success now is @transaction.atomic (https://stackoverflow.com/questions/21861207/)

170. By Daniel Holbach on 2015-11-04

merge trunk

[Daniel Holbach (dholbach)]

Markdown importer works after migration in sqlite scenario using these steps: http://pastebin.ubuntu.com/13101183/

[Daniel Holbach (dholbach)]

The migration using http://pastebin.ubuntu.com/13101380/ (postgres) works fine, but the article tree there is broken too. Symptoms: unpublished articles, parent pages can't be found → sys.exit. Maybe the code in django-cms changed and we need to use a new API?

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/1470715]

171. By Daniel Holbach on 2015-11-06

merge trunk

172. By Daniel Holbach on 2015-11-06

update permissions model changes

173. By Daniel Holbach on 2015-11-16

merge trunk

174. By Daniel Holbach on 2015-11-16

update migrations accordingly

175. By Daniel Holbach on 2015-11-17

remove non-existing migration dependency

176. By Daniel Holbach on 2015-11-17

update Makefile target for migration

177. By Daniel Holbach on 2015-11-17

update pip components and migration script

178. By Daniel Holbach on 2015-11-17

avoid breakage with some newer components

[Daniel Holbach (dholbach)]

With this we are not 100% up to date:

daniel@daydream:~/dev/sites/developer-ubuntu-com$ ./env/bin/pip list -o
argparse (Current: 1.2.1 Latest: 1.4.0)
→ Pillow (Current: 2.9.0 Latest: 3.0.0)
pip (Current: 1.5.6 Latest: 7.1.2)
→ django-cms (Current: 3.1.2 Latest: 3.1.3)
html5lib (Current: 0.999 Latest: 0.9999999)
Django-Select2 (Current: 4.3.2 Latest: 5.3.0)
→ Django (Current: 1.8.5 Latest: 1.8.6)
daniel@daydream:~/dev/sites/developer-ubuntu-com$

I ran into some issues with the newest versions (components marked with '→'), so I downgraded them. The other components are just pulled in by others.

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/1470715]

179. By Daniel Holbach on 2015-11-17

remove comments

[Daniel Holbach (dholbach)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-10-30 10:11:17 +0000
+++ Makefile	2015-11-17 14:32:37 +0000
@@ -3,9 +3,34 @@
 SOURCE_DIR := $(PWD)
 REVNO := `bzr revno`
 
+update-1470715:
+	./env/bin/pip install -r requirements.txt --upgrade
+	./env/bin/pip uninstall -yq South
+	./env/bin/pip uninstall -yq python-keystoneclient
+	./env/bin/python manage.py migrate --fake admin
+	./env/bin/python manage.py migrate --fake sessions
+	./env/bin/python manage.py migrate --fake sites
+	./env/bin/python manage.py migrate --fake cms 0001_initial
+	./env/bin/python manage.py migrate --fake cms 0002_auto_20140816_1918
+	./env/bin/python manage.py migrate --fake cmsplugin_zinnia
+	./env/bin/python manage.py migrate --fake djangocms_link 0001_initial
+	./env/bin/python manage.py migrate --fake djangocms_picture
+	./env/bin/python manage.py migrate --fake djangocms_snippet 0001_initial
+	./env/bin/python manage.py migrate --fake djangocms_text_ckeditor
+	./env/bin/python manage.py migrate --fake djangocms_video
+	./env/bin/python manage.py migrate --fake django_comments 0001_initial
+	./env/bin/python manage.py migrate --fake menus
+	./env/bin/python manage.py migrate --fake reversion 0001_initial
+	./env/bin/python manage.py migrate cms
+	./env/bin/python manage.py migrate --fake developer_portal
+	./env/bin/python manage.py migrate --fake api_docs
+	./env/bin/python manage.py migrate --fake django_openid_auth 0001_initial
+	./env/bin/python manage.py migrate --fake store_data 0001_initial
+	./env/bin/python manage.py migrate
+
 update-instance:
 	@echo "Nothing to do for the app";
-	
+
 update-common:
 	@echo "Updating database"
 	if [ $(DATABASE_URL) ]; then $(MAKE) initdb; fi
@@ -45,8 +70,8 @@
 	@python manage.py init_apidocs --settings charm_settings
 
 syncdb:
-	@echo "Syncing database"
-	@python manage.py syncdb --noinput --migrate --settings charm_settings
+	@echo "Syncing/migrating database"
+	@python manage.py migrate --noinput --settings charm_settings
 
 collectstatic: collectstatic.done
 collectstatic.done:
@@ -63,7 +88,7 @@
 	rm -rf pip-cache
 	bzr branch lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
 	pip install --exists-action=w --download pip-cache/ -r requirements.txt
-	bzr add pip-cache/* 
+	bzr add pip-cache/*
 	bzr commit pip-cache/ -m 'automatically updated devportal requirements'
 	bzr push --directory pip-cache lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies
 	bzr revno pip-cache > pip-cache-revno.txt
@@ -82,7 +107,7 @@
 
 db.sqlite3: env
 	@echo "Initializing database"
-	@./env/bin/python manage.py syncdb --noinput --migrate
+	@./env/bin/python manage.py migrate --noinput
 	@./env/bin/python manage.py initdb
 	@./env/bin/python manage.py init_apidocs
 
@@ -111,4 +136,3 @@
 	@rm ../developer_portal.tar.gz
 	@$(MAKE) tarball;
 	@echo build_label=`bzr revno`
-

=== modified file 'README.md'
--- README.md	2015-10-01 13:48:23 +0000
+++ README.md	2015-11-17 14:32:37 +0000
@@ -4,7 +4,7 @@
 2. Change directory to the branch location
 3. Install the apt requirements:
 
-    sudo apt install python-dev python-django python-django-south python-psycopg2 pwgen virtualenv
+    sudo apt install python-dev python-django python-psycopg2 pwgen virtualenv
 
 4. Setup your local dev environment:
 
@@ -27,7 +27,7 @@
     ./env/bin/python manage.py flush --noinput
     echo "delete from auth_permission;" | ./env/bin/python manage.py dbshell
     ./env/bin/python manage.py loaddata ../dbbackup/dbdump.json
-    ./env/bin/python manage.py syncdb --noinput --all
+    ./env/bin/python manage.py migrate --noinput
     ./env/bin/python manage.py initdb
 
 # Managing translations

=== added file 'api_docs/migrations/0001_initial.py'
--- api_docs/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ api_docs/migrations/0001_initial.py	2015-11-17 14:32:37 +0000
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Element',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('description', models.CharField(default=b'', max_length=256, blank=True)),
+                ('fullname', models.CharField(max_length=128)),
+                ('keywords', models.CharField(default=b'', max_length=256, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+            ],
+            options={
+                'ordering': ('name',),
+                'verbose_name': 'Rendered Element',
+                'verbose_name_plural': 'Rendered Elements',
+            },
+        ),
+        migrations.CreateModel(
+            name='Language',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Namespace',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('display_name', models.CharField(default=b'', max_length=64, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+            ],
+            options={
+                'ordering': ('name',),
+            },
+        ),
+        migrations.CreateModel(
+            name='Page',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('slug', models.CharField(max_length=64)),
+                ('title', models.CharField(max_length=64)),
+                ('description', models.CharField(default=b'', max_length=256, blank=True)),
+                ('fullname', models.CharField(max_length=128)),
+                ('keywords', models.CharField(default=b'', max_length=256, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+                ('order_index', models.PositiveIntegerField(default=0, blank=True)),
+                ('namespace', models.ForeignKey(blank=True, to='api_docs.Namespace', null=True)),
+            ],
+            options={
+                'ordering': ('order_index',),
+                'verbose_name': 'Rendered Page',
+                'verbose_name_plural': 'Rendered Pages',
+            },
+        ),
+        migrations.CreateModel(
+            name='Section',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('description', models.TextField(null=True, blank=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Topic',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Version',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+                ('language', models.ForeignKey(to='api_docs.Language', null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='section',
+            name='topic_version',
+            field=models.ForeignKey(to='api_docs.Version'),
+        ),
+        migrations.AddField(
+            model_name='page',
+            name='section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+        migrations.AddField(
+            model_name='namespace',
+            name='platform_section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='current_version',
+            field=models.ForeignKey(related_name='current_for_lang', blank=True, to='api_docs.Version', null=True),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='development_version',
+            field=models.ForeignKey(related_name='development_for_lang', blank=True, to='api_docs.Version', null=True),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='topic',
+            field=models.ForeignKey(to='api_docs.Topic'),
+        ),
+        migrations.AddField(
+            model_name='element',
+            name='namespace',
+            field=models.ForeignKey(blank=True, to='api_docs.Namespace', null=True),
+        ),
+        migrations.AddField(
+            model_name='element',
+            name='section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+    ]

=== removed file 'api_docs/migrations/0001_initial.py'
--- api_docs/migrations/0001_initial.py	2015-02-05 14:24:04 +0000
+++ api_docs/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Topic'
-        db.create_table(u'api_docs_topic', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal(u'api_docs', ['Topic'])
-
-        # Adding model 'Language'
-        db.create_table(u'api_docs_language', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('topic', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Topic'])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('current_version', self.gf('django.db.models.fields.related.ForeignKey')(related_name='current_for_lang', null=True, to=orm['api_docs.Version'])),
-            ('development_version', self.gf('django.db.models.fields.related.ForeignKey')(related_name='development_for_lang', null=True, to=orm['api_docs.Version'])),
-        ))
-        db.send_create_signal(u'api_docs', ['Language'])
-
-        # Adding model 'Version'
-        db.create_table(u'api_docs_version', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('language', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Language'], null=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal(u'api_docs', ['Version'])
-
-        # Adding model 'Section'
-        db.create_table(u'api_docs_section', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('topic_version', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Version'])),
-        ))
-        db.send_create_signal(u'api_docs', ['Section'])
-
-        # Adding model 'Namespace'
-        db.create_table(u'api_docs_namespace', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('platform_section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('display_name', self.gf('django.db.models.fields.CharField')(default='', max_length=64, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Namespace'])
-
-        # Adding model 'Element'
-        db.create_table(u'api_docs_element', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('namespace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Namespace'], null=True, blank=True)),
-            ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('fullname', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Element'])
-
-        # Adding model 'Page'
-        db.create_table(u'api_docs_page', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('namespace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Namespace'], null=True, blank=True)),
-            ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('fullname', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-            ('order_index', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Page'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Topic'
-        db.delete_table(u'api_docs_topic')
-
-        # Deleting model 'Language'
-        db.delete_table(u'api_docs_language')
-
-        # Deleting model 'Version'
-        db.delete_table(u'api_docs_version')
-
-        # Deleting model 'Section'
-        db.delete_table(u'api_docs_section')
-
-        # Deleting model 'Namespace'
-        db.delete_table(u'api_docs_namespace')
-
-        # Deleting model 'Element'
-        db.delete_table(u'api_docs_element')
-
-        # Deleting model 'Page'
-        db.delete_table(u'api_docs_page')
-
-
-    models = {
-        u'api_docs.element': {
-            'Meta': {'ordering': "('name',)", 'object_name': 'Element'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'fullname': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'namespace': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Namespace']", 'null': 'True', 'blank': 'True'}),
-            'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
-        },
-        u'api_docs.language': {
-            'Meta': {'object_name': 'Language'},
-            'current_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'current_for_lang'", 'null': 'True', 'to': u"orm['api_docs.Version']"}),
-            'development_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'development_for_lang'", 'null': 'True', 'to': u"orm['api_docs.Version']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Topic']"})
-        },
-        u'api_docs.namespace': {
-            'Meta': {'ordering': "('name',)", 'object_name': 'Namespace'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'display_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '64', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'platform_section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
-        },
-        u'api_docs.page': {
-            'Meta': {'ordering': "('order_index',)", 'object_name': 'Page'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'fullname': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'namespace': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Namespace']", 'null': 'True', 'blank': 'True'}),
-            'order_index': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'blank': 'True'}),
-            'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        u'api_docs.section': {
-            'Meta': {'object_name': 'Section'},
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'topic_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Version']"})
-        },
-        u'api_docs.topic': {
-            'Meta': {'object_name': 'Topic'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        u'api_docs.version': {
-            'Meta': {'object_name': 'Version'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Language']", 'null': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        }
-    }
-
-    complete_apps = ['api_docs']
\ No newline at end of file

=== modified file 'developer_portal/admin.py'
--- developer_portal/admin.py	2015-10-21 14:41:23 +0000
+++ developer_portal/admin.py	2015-11-17 14:32:37 +0000
@@ -12,8 +12,10 @@
 
 
 def import_selected_external_docs_branches(modeladmin, request, queryset):
+    branches = []
     for branch in queryset:
-        call_command('import-external-docs-branches', branch.docs_namespace)
+        branches.append(branch.docs_namespace)
+    call_command('import-external-docs-branches', *branches)
     import_selected_external_docs_branches.short_description = \
         "Import selected branches"
 

=== modified file 'developer_portal/blog/views.py'
--- developer_portal/blog/views.py	2015-01-14 22:38:55 +0000
+++ developer_portal/blog/views.py	2015-11-17 14:32:37 +0000
@@ -35,7 +35,9 @@
         return super(MultiLangEntryIndex, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryIndex, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryIndex, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryIndex, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryYear(MultiLangMixin, EntryYear):
     def get(self, request, *args, **kwargs):

=== modified file 'developer_portal/management/commands/import-external-docs-branches.py'
--- developer_portal/management/commands/import-external-docs-branches.py	2015-11-06 09:46:58 +0000
+++ developer_portal/management/commands/import-external-docs-branches.py	2015-11-17 14:32:37 +0000
@@ -33,7 +33,7 @@
     def remove_page(self, page_id):
         self.removed_pages += [page_id]
 
-    @transaction.commit_on_success()
+    @transaction.atomic()
     def run(self):
         for added_page in self.added_pages:
             page = get_or_create_page(**added_page)
@@ -44,7 +44,7 @@
                             created_by="script").delete()
 
         # https://stackoverflow.com/questions/33284171/
-        call_command('cms', 'fix-mptt')
+        call_command('cms', 'fix-tree')
 
 
 class MarkdownFile:
@@ -353,13 +353,17 @@
 class Command(BaseCommand):
     help = "Import external branches for documentation."
 
+    def add_arguments(self, parser):
+        parser.add_argument('branches', nargs='*')
+
     def handle(*args, **options):
         logging.basicConfig(
             level=logging.ERROR,
             format='%(asctime)s %(levelname)-8s %(message)s',
             datefmt='%F %T')
-        if len(args) < 2 or args[1] == "all":
-            selection = '.*'
+        branches = options['branches']
+        if not branches:
+            import_branches('.*')
         else:
-            selection = args[1]
-        import_branches(selection)
+            for b in branches:
+                import_branches(b)

=== modified file 'developer_portal/management/commands/initdb.py'
--- developer_portal/management/commands/initdb.py	2015-06-23 10:54:49 +0000
+++ developer_portal/management/commands/initdb.py	2015-11-17 14:32:37 +0000
@@ -53,7 +53,7 @@
         if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
             print "Configuring "+settings.EDITOR_GROUP+" group."
             editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
-            page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__name='page')
+            page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__model='page')
             editors.permissions.add(*list(page_perms))
 
             print "Configuring global permissions for group."

=== added file 'developer_portal/migrations/0001_initial.py'
--- developer_portal/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ developer_portal/migrations/0001_initial.py	2015-11-17 14:32:37 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExternalDocsBranch',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('lp_origin', models.CharField(help_text='External branch location, ie: lp:snappy/15.04 or https://github.com/ubuntu-core/snappy.git', max_length=200)),
+                ('docs_namespace', models.CharField(help_text='Path alias we want to use for the docs, ie "snappy/guides/15.04" or "snappy/guides/latest", etc.', max_length=120)),
+                ('index_doc', models.CharField(help_text='File name of doc to be used as index document, ie "intro.md"', max_length=120, blank=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='RawHtml',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('body', models.TextField(verbose_name='body')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='SEOExtension',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('keywords', models.CharField(max_length=256)),
+                ('extended_object', models.OneToOneField(editable=False, to='cms.Title')),
+                ('public_extension', models.OneToOneField(related_name='draft_extension', null=True, editable=False, to='developer_portal.SEOExtension')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

=== removed file 'developer_portal/migrations/0001_initial.py'
--- developer_portal/migrations/0001_initial.py	2015-01-19 16:29:47 +0000
+++ developer_portal/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        pass
-
-    def backwards(self, orm):
-        pass
-
-    models = {
-        
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0002_add_rawhtml_plugin.py'
--- developer_portal/migrations/0002_add_rawhtml_plugin.py	2015-01-19 16:29:47 +0000
+++ developer_portal/migrations/0002_add_rawhtml_plugin.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'RawHtml'
-        db.create_table(u'developer_portal_rawhtml', (
-            (u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
-            ('body', self.gf('django.db.models.fields.TextField')()),
-        ))
-        db.send_create_signal(u'developer_portal', ['RawHtml'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'RawHtml'
-        db.delete_table(u'developer_portal_rawhtml')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0003_add_external_docs_branches.py'
--- developer_portal/migrations/0003_add_external_docs_branches.py	2015-08-06 09:30:11 +0000
+++ developer_portal/migrations/0003_add_external_docs_branches.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'ExternalDocsBranch'
-        db.create_table(u'developer_portal_externaldocsbranch', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('lp_origin', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('docs_namespace', self.gf('django.db.models.fields.CharField')(max_length=120)),
-            ('index_doc', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)),
-        ))
-        db.send_create_signal(u'developer_portal', ['ExternalDocsBranch'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'ExternalDocsBranch'
-        db.delete_table(u'developer_portal_externaldocsbranch')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        u'developer_portal.externaldocsbranch': {
-            'Meta': {'object_name': 'ExternalDocsBranch'},
-            'docs_namespace': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'index_doc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
-            'lp_origin': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0004_auto__add_seoextension.py'
--- developer_portal/migrations/0004_auto__add_seoextension.py	2015-10-21 14:41:23 +0000
+++ developer_portal/migrations/0004_auto__add_seoextension.py	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'SEOExtension'
-        db.create_table(u'developer_portal_seoextension', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('public_extension', self.gf('django.db.models.fields.related.OneToOneField')(related_name='draft_extension', unique=True, null=True, to=orm['developer_portal.SEOExtension'])),
-            ('extended_object', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.Title'], unique=True)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(max_length=256)),
-        ))
-        db.send_create_signal(u'developer_portal', ['SEOExtension'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'SEOExtension'
-        db.delete_table(u'developer_portal_seoextension')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.page': {
-            'Meta': {'ordering': "('tree_id', 'lft')", 'unique_together': "(('publisher_is_draft', 'application_namespace'), ('reverse_id', 'site', 'publisher_is_draft'))", 'object_name': 'Page'},
-            'application_namespace': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'application_urls': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'changed_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'created_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'in_navigation': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'is_home': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'languages': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'limit_visibility_in_menu': ('django.db.models.fields.SmallIntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'login_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'navigation_extenders': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '80', 'null': 'True', 'blank': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['cms.Page']"}),
-            'placeholders': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['cms.Placeholder']", 'symmetrical': 'False'}),
-            'publication_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'publication_end_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'publisher_is_draft': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'publisher_public': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'publisher_draft'", 'unique': 'True', 'null': 'True', 'to': "orm['cms.Page']"}),
-            'reverse_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '40', 'null': 'True', 'blank': 'True'}),
-            'revision_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'site': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'djangocms_pages'", 'to': u"orm['sites.Site']"}),
-            'soft_root': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'template': ('django.db.models.fields.CharField', [], {'default': "'INHERIT'", 'max_length': '100'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'xframe_options': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        'cms.title': {
-            'Meta': {'unique_together': "(('language', 'page'),)", 'object_name': 'Title'},
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'has_url_overwrite': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'menu_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'meta_description': ('django.db.models.fields.TextField', [], {'max_length': '155', 'null': 'True', 'blank': 'True'}),
-            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'title_set'", 'to': "orm['cms.Page']"}),
-            'page_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'publisher_is_draft': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'publisher_public': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'publisher_draft'", 'unique': 'True', 'null': 'True', 'to': "orm['cms.Title']"}),
-            'publisher_state': ('django.db.models.fields.SmallIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'redirect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        u'developer_portal.externaldocsbranch': {
-            'Meta': {'object_name': 'ExternalDocsBranch'},
-            'docs_namespace': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'index_doc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
-            'lp_origin': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        u'developer_portal.seoextension': {
-            'Meta': {'object_name': 'SEOExtension'},
-            'extended_object': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.Title']", 'unique': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'public_extension': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'draft_extension'", 'unique': 'True', 'null': 'True', 'to': u"orm['developer_portal.SEOExtension']"})
-        },
-        u'sites.site': {
-            'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"},
-            'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2015-10-02 15:50:10 +0000
+++ developer_portal/settings.py	2015-11-17 14:32:37 +0000
@@ -30,8 +30,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = ['127.0.0.1', 'developer.ubuntu.com']
 
 
@@ -49,14 +47,13 @@
     # Allow login from Ubuntu SSO
     'django_openid_auth',
 
-    'mptt', #utilities for implementing a modified pre-order traversal tree
     'menus', #helper for model independent hierarchical website navigation
-    'south', #intelligent schema and data migrations
     'sekizai', #for javascript and css management
     'reversion', #content versioning
     'django_pygments',
     'django_comments',
     'tagging',
+    'template_debug',
 
     'ckeditor',
     'djangocms_text_ckeditor',
@@ -66,6 +63,7 @@
     'djangocms_picture',
     'djangocms_video',
     'djangocms_snippet',
+    'treebeard', #required by django CMS
 
     'cmsplugin_zinnia',
     'zinnia',
@@ -107,24 +105,29 @@
 #CACHE_MIDDLEWARE_SECONDS = 3600
 #CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.request',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-
-    'sekizai.context_processors.sekizai',
-    'cms.context_processors.cms_settings',
-    'django.contrib.messages.context_processors.messages',
-)
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(PROJECT_PATH, "templates"),
-)
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_PATH, "templates"),
+            ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.core.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.core.context_processors.i18n',
+                'django.core.context_processors.media',
+                'django.core.context_processors.static',
+
+                'sekizai.context_processors.sekizai',
+                'cms.context_processors.cms_settings',
+                'django.contrib.messages.context_processors.messages',
+            ]
+        }
+    }
+]
 
 ROOT_URLCONF = 'developer_portal.urls'
 
@@ -313,6 +316,23 @@
     #'PAGINATE_BY': 10,
 }
 
+MIGRATION_MODULES = {
+    'cms': 'cms.migrations',
+    'cmsplugin_zinnia': 'cmsplugin_zinnia.migrations',
+    'djangocms_link': 'djangocms_link.migrations',
+    'djangocms_picture': 'djangocms_picture.migrations_django',
+    'djangocms_snippet': 'djangocms_snippet.migrations_django',
+    'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
+    'djangocms_video': 'djangocms_video.migrations_django',
+    'django_comments': 'django_comments.migrations',
+    'menus': 'menus.migrations',
+    'rest_framework.authtoken': 'rest_framework.authtoken.migrations',
+    'reversion': 'reversion.migrations',
+    'tagging': 'tagging.migrations',
+    'taggit': 'taggit.migrations',
+    'zinnia': 'zinnia.migrations',
+}
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

=== modified file 'developer_portal/urls.py'
--- developer_portal/urls.py	2015-06-25 21:53:23 +0000
+++ developer_portal/urls.py	2015-11-17 14:32:37 +0000
@@ -32,7 +32,7 @@
 
 urlpatterns += i18n_patterns('',
     url(r'^search/', 'developer_portal.views.search', name='search'),
-    url(r'^ckeditor/', include('ckeditor.urls')),
+    url(r'^ckeditor/', include('ckeditor_uploader.urls')),
     url(r'^', include('cms.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

=== modified file 'requirements.txt'
--- requirements.txt	2015-10-29 10:55:07 +0000
+++ requirements.txt	2015-11-17 14:32:37 +0000
@@ -1,53 +1,51 @@
-oslo.config==1.6.0
-oslo.i18n==1.2.0
-oslo.serialization==1.2.0
-oslo.utils==1.2.0
-Django==1.6.8
-Markdown==2.6.2
-South==1.0.1
-Pillow==2.6.1
-beautifulsoup4==4.4.0
-cmsplugin-zinnia==0.6
+Django==1.8.5
+django-template-debug==0.3.5
+oslo.config==2.7.0
+oslo.i18n==2.7.0
+oslo.serialization==1.11.0
+oslo.utils==2.8.0
+Pillow==2.9.0
+cmsplugin-zinnia==0.8
+Markdown==2.6.4
+beautifulsoup4==4.4.1
 dj-database-url==0.3.0
-django-admin-enhancer==0.1.3.1
-django-appconf==0.6
-django-blog-zinnia==0.14.2
-django-ckeditor==4.4.7
+django-admin-enhancer==1.0.0
+django-appconf==1.0.1
+django-blog-zinnia==0.15.2
+django-ckeditor==5.0.2
 django-ckeditor-updated==4.4.4
-django-classy-tags==0.5.1
-django-cms==3.0.6
-django-contrib-comments==1.5
-django-meta==0.2.0
-django-meta-mixin==0.1.1
+django-classy-tags==0.6.2
+django-cms==3.1.2
+django-contrib-comments==1.6.1
+django-meta==0.3.1
+django-meta-mixin==0.2.1
 django-missing==0.1.13
-django-mptt==0.7.4
-django-parler==1.1.1
-django-polymorphic==0.6
-django-reversion==1.8.4
-django-sekizai==0.7
+django-parler==1.5.1
+django-polymorphic==0.7.2
+django-reversion==1.9.3
+django-sekizai==0.8.2
 django-swiftstorage==1.1.0
-django-tagging==0.3.3
-django-taggit==0.12.2
-django-taggit-autosuggest==0.2.5
+django-tagging==0.4
+django-taggit==0.17.3
+django-taggit-autosuggest==0.2.7
 django-taggit-templatetags==0.2.5
 django-templatetag-sugar==1.0
 django-xmlrpc==0.1.5
-djangocms-admin-style==0.2.2
-djangocms-link==1.5
+djangocms-admin-style==1.0.5
+djangocms-link==1.7.1
 djangocms-picture==0.1
-djangocms-snippet==1.3
-djangocms-text-ckeditor==2.4.2
+djangocms-snippet==1.5
+djangocms-text-ckeditor==2.7.0
 djangocms-utils==0.9.5
 djangocms-video==0.1
-python-keystoneclient==0.11.2
-python-swiftclient==2.3.1
-pytz==2014.7
+python-swiftclient==2.6.0
+pytz==2015.7
 simple-translation==0.8.6
-simplejson==3.6.5
+simplejson==3.8.1
 wsgiref==0.1.2
-zinnia-wysiwyg-ckeditor==1.1
-Pygments==1.6
+zinnia-wysiwyg-ckeditor==1.3
+Pygments==2.0.2
 django-pygments==0.1
-django-openid-auth==0.5
-python-openid==2.2.4
-djangorestframework==3.0.4
+django-openid-auth==0.7
+python-openid==2.2.5
+djangorestframework==3.3.1

=== modified file 'service/urls.py'
--- service/urls.py	2015-02-05 14:24:04 +0000
+++ service/urls.py	2015-11-17 14:32:37 +0000
@@ -4,13 +4,13 @@
 
 # Routers provide an easy way of automatically determining the URL conf
 router = routers.DefaultRouter()
-router.register(r'elements', ElementViewSet)
-router.register(r'pages', PageViewSet)
-router.register(r'namespaces', NamespaceViewSet)
-router.register(r'sections', SectionViewSet)
-router.register(r'versions', VersionViewSet)
-router.register(r'languages', LanguageViewSet)
-router.register(r'topics', TopicViewSet)
+router.register(r'elements', ElementViewSet, base_name='element-list')
+router.register(r'pages', PageViewSet, base_name='page-list')
+router.register(r'namespaces', NamespaceViewSet, base_name='namespace-list')
+router.register(r'sections', SectionViewSet, base_name='section-list')
+router.register(r'versions', VersionViewSet, base_name='version-list')
+router.register(r'languages', LanguageViewSet, base_name='language-list')
+router.register(r'topics', TopicViewSet, base_name='topic-list')
 
 
 # Wire up our API using automatic URL routing.

=== modified file 'store_data/migrations/0001_initial.py'
--- store_data/migrations/0001_initial.py	2015-07-02 08:49:35 +0000
+++ store_data/migrations/0001_initial.py	2015-11-17 14:32:37 +0000
@@ -1,134 +1,63 @@
 # -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Release'
-        db.create_table(u'store_data_release', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=25)),
-        ))
-        db.send_create_signal(u'store_data', ['Release'])
-
-        # Adding model 'Architecture'
-        db.create_table(u'store_data_architecture', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=10)),
-        ))
-        db.send_create_signal(u'store_data', ['Architecture'])
-
-        # Adding model 'ScreenshotURL'
-        db.create_table(u'store_data_screenshoturl', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
-        ))
-        db.send_create_signal(u'store_data', ['ScreenshotURL'])
-
-        # Adding model 'GadgetSnap'
-        db.create_table(u'store_data_gadgetsnap', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('icon_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
-            ('ratings_average', self.gf('django.db.models.fields.DecimalField')(max_digits=2, decimal_places=1)),
-            ('alias', self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True)),
-            ('price', self.gf('django.db.models.fields.DecimalField')(max_digits=5, decimal_places=2)),
-            ('publisher', self.gf('django.db.models.fields.CharField')(max_length=100)),
-            ('store_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
-            ('version', self.gf('django.db.models.fields.CharField')(max_length=25)),
-            ('last_updated', self.gf('django.db.models.fields.DateTimeField')()),
-            ('description', self.gf('django.db.models.fields.TextField')(max_length=5000)),
-        ))
-        db.send_create_signal(u'store_data', ['GadgetSnap'])
-
-        # Adding M2M table for field release on 'GadgetSnap'
-        m2m_table_name = db.shorten_name(u'store_data_gadgetsnap_release')
-        db.create_table(m2m_table_name, (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('gadgetsnap', models.ForeignKey(orm[u'store_data.gadgetsnap'], null=False)),
-            ('release', models.ForeignKey(orm[u'store_data.release'], null=False))
-        ))
-        db.create_unique(m2m_table_name, ['gadgetsnap_id', 'release_id'])
-
-        # Adding M2M table for field architecture on 'GadgetSnap'
-        m2m_table_name = db.shorten_name(u'store_data_gadgetsnap_architecture')
-        db.create_table(m2m_table_name, (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('gadgetsnap', models.ForeignKey(orm[u'store_data.gadgetsnap'], null=False)),
-            ('architecture', models.ForeignKey(orm[u'store_data.architecture'], null=False))
-        ))
-        db.create_unique(m2m_table_name, ['gadgetsnap_id', 'architecture_id'])
-
-        # Adding M2M table for field screenshot_url on 'GadgetSnap'
-        m2m_table_name = db.shorten_name(u'store_data_gadgetsnap_screenshot_url')
-        db.create_table(m2m_table_name, (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('gadgetsnap', models.ForeignKey(orm[u'store_data.gadgetsnap'], null=False)),
-            ('screenshoturl', models.ForeignKey(orm[u'store_data.screenshoturl'], null=False))
-        ))
-        db.create_unique(m2m_table_name, ['gadgetsnap_id', 'screenshoturl_id'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Release'
-        db.delete_table(u'store_data_release')
-
-        # Deleting model 'Architecture'
-        db.delete_table(u'store_data_architecture')
-
-        # Deleting model 'ScreenshotURL'
-        db.delete_table(u'store_data_screenshoturl')
-
-        # Deleting model 'GadgetSnap'
-        db.delete_table(u'store_data_gadgetsnap')
-
-        # Removing M2M table for field release on 'GadgetSnap'
-        db.delete_table(db.shorten_name(u'store_data_gadgetsnap_release'))
-
-        # Removing M2M table for field architecture on 'GadgetSnap'
-        db.delete_table(db.shorten_name(u'store_data_gadgetsnap_architecture'))
-
-        # Removing M2M table for field screenshot_url on 'GadgetSnap'
-        db.delete_table(db.shorten_name(u'store_data_gadgetsnap_screenshot_url'))
-
-
-    models = {
-        u'store_data.architecture': {
-            'Meta': {'object_name': 'Architecture'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '10'})
-        },
-        u'store_data.gadgetsnap': {
-            'Meta': {'object_name': 'GadgetSnap'},
-            'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'architecture': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Architecture']", 'symmetrical': 'False'}),
-            'description': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
-            'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
-            'publisher': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'ratings_average': ('django.db.models.fields.DecimalField', [], {'max_digits': '2', 'decimal_places': '1'}),
-            'release': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Release']", 'symmetrical': 'False'}),
-            'screenshot_url': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.ScreenshotURL']", 'symmetrical': 'False'}),
-            'store_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            'version': ('django.db.models.fields.CharField', [], {'max_length': '25'})
-        },
-        u'store_data.release': {
-            'Meta': {'object_name': 'Release'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '25'})
-        },
-        u'store_data.screenshoturl': {
-            'Meta': {'object_name': 'ScreenshotURL'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['store_data']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Architecture',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=10)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='GadgetSnap',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('icon_url', models.URLField(blank=True)),
+                ('name', models.CharField(max_length=100)),
+                ('title', models.CharField(max_length=250, null=True, blank=True)),
+                ('ratings_average', models.DecimalField(max_digits=2, decimal_places=1)),
+                ('alias', models.CharField(max_length=100, null=True, blank=True)),
+                ('price', models.DecimalField(max_digits=5, decimal_places=2)),
+                ('publisher', models.CharField(max_length=100)),
+                ('store_url', models.URLField(blank=True)),
+                ('version', models.CharField(max_length=25)),
+                ('last_updated', models.DateTimeField()),
+                ('description', models.TextField(max_length=5000)),
+                ('website', models.URLField(blank=True)),
+                ('architecture', models.ManyToManyField(to='store_data.Architecture')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Release',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=25)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ScreenshotURL',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('url', models.URLField(blank=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='gadgetsnap',
+            name='release',
+            field=models.ManyToManyField(to='store_data.Release'),
+        ),
+        migrations.AddField(
+            model_name='gadgetsnap',
+            name='screenshot_url',
+            field=models.ManyToManyField(to='store_data.ScreenshotURL'),
+        ),
+    ]

=== removed file 'store_data/migrations/0002_add_title_field.py'
--- store_data/migrations/0002_add_title_field.py	2015-11-10 14:13:42 +0000
+++ store_data/migrations/0002_add_title_field.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'GadgetSnap.title'
-        db.add_column(u'store_data_gadgetsnap', 'title',
-                      self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'GadgetSnap.title'
-        db.delete_column(u'store_data_gadgetsnap', 'title')
-
-
-    models = {
-        u'store_data.architecture': {
-            'Meta': {'object_name': 'Architecture'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '10'})
-        },
-        u'store_data.gadgetsnap': {
-            'Meta': {'object_name': 'GadgetSnap'},
-            'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'architecture': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Architecture']", 'symmetrical': 'False'}),
-            'description': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
-            'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
-            'publisher': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'ratings_average': ('django.db.models.fields.DecimalField', [], {'max_digits': '2', 'decimal_places': '1'}),
-            'release': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Release']", 'symmetrical': 'False'}),
-            'screenshot_url': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.ScreenshotURL']", 'symmetrical': 'False'}),
-            'store_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
-            'version': ('django.db.models.fields.CharField', [], {'max_length': '25'})
-        },
-        u'store_data.release': {
-            'Meta': {'object_name': 'Release'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '25'})
-        },
-        u'store_data.screenshoturl': {
-            'Meta': {'object_name': 'ScreenshotURL'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['store_data']
\ No newline at end of file

=== removed file 'store_data/migrations/0003_add_website_field.py'
--- store_data/migrations/0003_add_website_field.py	2015-11-10 14:52:15 +0000
+++ store_data/migrations/0003_add_website_field.py	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'GadgetSnap.website'
-        db.add_column(u'store_data_gadgetsnap', 'website',
-                      self.gf('django.db.models.fields.URLField')(default='', max_length=200, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'GadgetSnap.website'
-        db.delete_column(u'store_data_gadgetsnap', 'website')
-
-
-    models = {
-        u'store_data.architecture': {
-            'Meta': {'object_name': 'Architecture'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '10'})
-        },
-        u'store_data.gadgetsnap': {
-            'Meta': {'object_name': 'GadgetSnap'},
-            'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'architecture': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Architecture']", 'symmetrical': 'False'}),
-            'description': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
-            'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
-            'publisher': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'ratings_average': ('django.db.models.fields.DecimalField', [], {'max_digits': '2', 'decimal_places': '1'}),
-            'release': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Release']", 'symmetrical': 'False'}),
-            'screenshot_url': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.ScreenshotURL']", 'symmetrical': 'False'}),
-            'store_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
-            'version': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
-            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        },
-        u'store_data.release': {
-            'Meta': {'object_name': 'Release'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '25'})
-        },
-        u'store_data.screenshoturl': {
-            'Meta': {'object_name': 'ScreenshotURL'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['store_data']
\ No newline at end of file

=== modified file 'templates/zinnia/_entry_detail_base.html'
--- templates/zinnia/_entry_detail_base.html	2014-12-16 22:52:40 +0000
+++ templates/zinnia/_entry_detail_base.html	2015-11-17 14:32:37 +0000
@@ -1,4 +1,4 @@
-{% load i18n zinnia_tags %}
+{% load i18n zinnia %}
 <article class="row no-border no-padding-bottom post {% if object.featured %} featured{% endif %}">
     <div class="eight-col">
         {% block entry-header %}
@@ -70,4 +70,4 @@
         </aside>
         {% endblock entry-info %}
     </div>
-</article>
\ No newline at end of file
+</article>

=== modified file 'templates/zinnia/base.html'
--- templates/zinnia/base.html	2015-01-14 22:38:55 +0000
+++ templates/zinnia/base.html	2015-11-17 14:32:37 +0000
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load zinnia_tags i18n %}
+{% load zinnia i18n %}
 {% load cms_tags sekizai_tags menu_tags static %}
 
 {% block meta-keywords %}{% get_tags as entry_tags %}{{ entry_tags|join:", "}}{% endblock meta-keywords %}

=== modified file 'templates/zinnia/category_list.html'
--- templates/zinnia/category_list.html	2015-01-16 21:02:45 +0000
+++ templates/zinnia/category_list.html	2015-11-17 14:32:37 +0000
@@ -1,5 +1,6 @@
 {% extends "zinnia/base.html" %}
-{% load i18n mptt_tags %}
+
+{% load i18n %}
 
 {% block meta-description %}{% trans "Category list" %}{% endblock meta-description %}
 

=== modified file 'templates/zinnia/entry_detail_base.html'
--- templates/zinnia/entry_detail_base.html	2015-01-16 21:02:45 +0000
+++ templates/zinnia/entry_detail_base.html	2015-11-17 14:32:37 +0000
@@ -1,5 +1,5 @@
 {% extends "zinnia/base.html" %}
-{% load i18n comments zinnia_tags %}
+{% load i18n comments zinnia %}
 {% load cycle from future %}
 
 {% block title %}{{ object.title }} | {{ block.super }}{% endblock title%}

=== modified file 'templates/zinnia/entry_list.html'
--- templates/zinnia/entry_list.html	2014-12-17 10:51:06 +0000
+++ templates/zinnia/entry_list.html	2015-11-17 14:32:37 +0000
@@ -1,5 +1,5 @@
 {% extends "zinnia/base.html" %}
-{% load i18n zinnia_tags %}
+{% load i18n zinnia %}
 
 {% block meta-description %}{% trans "Latest entries for" %} {% if category %}{% trans "the category" %} {{ category }}{% if category.description %}: {{ category.description|striptags|safe }}{% endif %}{% endif %}{% if tag %}{% trans "the tag" %} {{ tag }}{% endif %}{% if author %}{% trans "the author" %} {{ author }}{% endif %}{% endblock meta-description %}