squash migrations
This commit is contained in:
Élie Bouttier
parent
a7d1ccd863
commit
61127a0770
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 19:13
|
||||
# Generated by Django 1.9.7 on 2016-06-15 09:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import accounts.utils
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 19:13
|
||||
# Generated by Django 1.9.7 on 2016-06-15 09:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
|
|
@ -12,10 +12,10 @@ class Migration(migrations.Migration):
|
|||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('proposals', '0001_initial'),
|
||||
('accounts', '0001_initial'),
|
||||
('sites', '0002_alter_domain_unique'),
|
||||
('accounts', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 19:13
|
||||
# Generated by Django 1.9.7 on 2016-06-15 09:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import conversations.utils
|
||||
|
|
@ -13,8 +13,8 @@ class Migration(migrations.Migration):
|
|||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('accounts', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
]
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
|
|||
name='ConversationAboutTalk',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('subscribers', models.ManyToManyField(related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)),
|
||||
('subscribers', models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
|
|
@ -34,7 +34,7 @@ class Migration(migrations.Migration):
|
|||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('participation', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='accounts.Participation')),
|
||||
('subscribers', models.ManyToManyField(related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL)),
|
||||
('subscribers', models.ManyToManyField(blank=True, related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
|
|
@ -47,7 +47,6 @@ class Migration(migrations.Migration):
|
|||
('object_id', models.PositiveIntegerField()),
|
||||
('token', models.CharField(default=conversations.utils.generate_message_token, max_length=64)),
|
||||
('date', models.DateTimeField(auto_now_add=True)),
|
||||
('subject', models.CharField(blank=True, max_length=64)),
|
||||
('content', models.TextField()),
|
||||
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 19:13
|
||||
# Generated by Django 1.9.7 on 2016-06-15 09:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 20:46
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('conversations', '0002_conversationabouttalk_talk'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='message',
|
||||
name='subject',
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='conversationabouttalk',
|
||||
name='subscribers',
|
||||
field=models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='conversationwithparticipant',
|
||||
name='subscribers',
|
||||
field=models.ManyToManyField(blank=True, related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.7 on 2016-06-14 19:13
|
||||
# Generated by Django 1.9.7 on 2016-06-15 09:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import autoslug.fields
|
||||
|
|
@ -15,8 +15,8 @@ class Migration(migrations.Migration):
|
|||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('sites', '0002_alter_domain_unique'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
|
|
|
|||
Loading…
Reference in New Issue