Skip to content

Commit

Permalink
Django 1.10.1
Browse files Browse the repository at this point in the history
Changes:

  * Remove south things
  * ImportError: cannot import name patterns
  * ImportError: cannot import name simplejson
  * Fixed templates settings
  * django 'future' is not a registered tag library
  * Updated django-recaptcha from 0.0.9 to 1.0.5
  * Updated easy-thumbnails from 2.2 to 2.3
  • Loading branch information
marcelometal committed Nov 15, 2016
1 parent 9d260a4 commit 25d3283
Show file tree
Hide file tree
Showing 26 changed files with 352 additions and 2,711 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -4,7 +4,7 @@ run:
@python manage.py runserver 0.0.0.0:8000

data:
@python manage.py syncdb --migrate
@python manage.py migrate

setup:
@pip install -U -e .\[tests\]
Expand Down
77 changes: 32 additions & 45 deletions cms/migrations/0001_initial.py
@@ -1,46 +1,33 @@
# -*- 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 'FAQ'
db.create_table(u'cms_faq', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('site', self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['sites.Site'])),
('question', self.gf('django.db.models.fields.TextField')(max_length=1000)),
('answer', self.gf('django.db.models.fields.TextField')(max_length=5000)),
('last_change', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
))
db.send_create_signal(u'cms', ['FAQ'])


def backwards(self, orm):
# Deleting model 'FAQ'
db.delete_table(u'cms_faq')


models = {
u'cms.faq': {
'Meta': {'object_name': 'FAQ'},
'answer': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'last_change': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'question': ('django.db.models.fields.TextField', [], {'max_length': '1000'}),
'site': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['sites.Site']"})
},
u'sites.site': {
'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'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 = ['cms']
# Generated by Django 1.10.1 on 2016-09-23 22:27
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('sites', '0002_alter_domain_unique'),
]

operations = [
migrations.CreateModel(
name='FAQ',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('question', models.TextField(max_length=1000, verbose_name='Question')),
('answer', models.TextField(max_length=5000, verbose_name='Answer')),
('last_change', models.DateTimeField(auto_now=True, verbose_name='Last Change')),
('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
('site', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='sites.Site', verbose_name='Site')),
],
options={
'verbose_name': 'FAQ',
'verbose_name_plural': 'FAQ',
},
),
]
441 changes: 267 additions & 174 deletions montanha/migrations/0001_initial.py

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

0 comments on commit 25d3283

Please sign in to comment.