Merge remote-tracking branch 'ithinksw/develop' into develop

diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py
index 3a8e82f..c2edd8d 100644 (file)
--- a/philo/contrib/penfield/models.py
+++ b/philo/contrib/penfield/models.py
@@ -486,9 +486,7 @@ class NewsletterView(FeedView):
                                url(r'^%s$' % self.issue_permalink_base, self.issue_archive_view, 'issue_archive')
                        )
                if self.article_archive_page:
-                       urlpatterns += patterns('',
-                               url(r'^%s' % self.article_permalink_base, include(self.feed_patterns('get_all_articles', 'article_archive_page', 'articles')))
-                       )
+                       urlpatterns += self.feed_patterns(r'^%s' % self.article_permalink_base, 'get_all_articles', 'article_archive_page', 'articles')
                        if self.article_permalink_style in 'DMY':
                                urlpatterns += self.feed_patterns(r'^%s/(?P<year>\d{4})' % self.article_permalink_base, 'get_articles_by_ymd', 'article_archive_page', 'articles_by_year')
                                if self.article_permalink_style in 'DM':

diff --git a/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py b/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py
index b2e6a5e..75a3dee 100644 (file)
--- a/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py
+++ b/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py
@@ -74,7 +74,8 @@ class Migration(SchemaMigration):
             'Meta': {'object_name': 'File'},
             'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         },
         'philo.foreignkeyvalue': {
             'Meta': {'object_name': 'ForeignKeyValue'},
@@ -94,7 +95,7 @@ class Migration(SchemaMigration):
             'values': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['philo.ForeignKeyValue']", 'null': 'True', 'blank': 'True'})
         },
         'philo.node': {
-            'Meta': {'object_name': 'Node'},
+            'Meta': {'unique_together': "(('parent', 'slug'),)", 'object_name': 'Node'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
             'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
@@ -126,7 +127,7 @@ class Migration(SchemaMigration):
             'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
         },
         'philo.template': {
-            'Meta': {'object_name': 'Template'},
+            'Meta': {'unique_together': "(('parent', 'slug'),)", 'object_name': 'Template'},
             'code': ('philo.models.fields.TemplateField', [], {}),
             'documentation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),