This repository has been archived by the owner on Sep 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from dstegelman/feature/django_17
Set Django 1.7 for Travis.
- Loading branch information
Showing
17 changed files
with
127 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,5 @@ django_mail_queue.egg-info/ | |
.idea | ||
*.iml | ||
/build | ||
.vagrant | ||
Vagrantfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
VERSION = '2.1.2' | ||
VERSION = '2.2.0' | ||
|
||
default_app_config = 'mailqueue.apps.MailQueueConfig' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from django.apps import AppConfig | ||
|
||
|
||
class MailQueueConfig(AppConfig): | ||
name = 'mailqueue' | ||
label = 'mailqueue' | ||
verbose_name = "Mail Queue" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,51 @@ | ||
# encoding: utf-8 | ||
import datetime | ||
from south.db import db | ||
from south.v2 import SchemaMigration | ||
from django.db import models | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
class Migration(SchemaMigration): | ||
from django.db import models, migrations | ||
|
||
def forwards(self, orm): | ||
|
||
# Adding model 'MailerMessage' | ||
db.create_table('mailqueue_mailermessage', ( | ||
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
('subject', self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True)), | ||
('to_address', self.gf('django.db.models.fields.EmailField')(max_length=250)), | ||
('from_address', self.gf('django.db.models.fields.EmailField')(max_length=250)), | ||
('content', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), | ||
('app', self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True)), | ||
('sent', self.gf('django.db.models.fields.BooleanField')(default=False)), | ||
)) | ||
db.send_create_signal('mailqueue', ['MailerMessage']) | ||
|
||
class Migration(migrations.Migration): | ||
|
||
def backwards(self, orm): | ||
|
||
# Deleting model 'MailerMessage' | ||
db.delete_table('mailqueue_mailermessage') | ||
dependencies = [ | ||
] | ||
|
||
|
||
models = { | ||
'mailqueue.mailermessage': { | ||
'Meta': {'object_name': 'MailerMessage'}, | ||
'app': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}), | ||
'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
'from_address': ('django.db.models.fields.EmailField', [], {'max_length': '250'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'sent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
'subject': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}), | ||
'to_address': ('django.db.models.fields.EmailField', [], {'max_length': '250'}) | ||
} | ||
} | ||
|
||
complete_apps = ['mailqueue'] | ||
operations = [ | ||
migrations.CreateModel( | ||
name='Attachment', | ||
fields=[ | ||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
('file_attachment', models.FileField(null=True, upload_to=b'mail-queue/attachments', blank=True)), | ||
], | ||
options={ | ||
'verbose_name': 'Attachment', | ||
'verbose_name_plural': 'Attachments', | ||
}, | ||
bases=(models.Model,), | ||
), | ||
migrations.CreateModel( | ||
name='MailerMessage', | ||
fields=[ | ||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
('subject', models.CharField(max_length=250, verbose_name='Subject', blank=True)), | ||
('to_address', models.TextField(verbose_name='To')), | ||
('bcc_address', models.TextField(verbose_name='BCC', blank=True)), | ||
('from_address', models.EmailField(max_length=250, verbose_name='From')), | ||
('content', models.TextField(verbose_name='Content', blank=True)), | ||
('html_content', models.TextField(verbose_name='HTML Content', blank=True)), | ||
('app', models.CharField(max_length=250, verbose_name='App', blank=True)), | ||
('sent', models.BooleanField(default=False, verbose_name='Sent', editable=False)), | ||
('last_attempt', models.DateTimeField(verbose_name='Last attempt', null=True, editable=False, blank=True)), | ||
], | ||
options={ | ||
'verbose_name': 'Message', | ||
'verbose_name_plural': 'Messages', | ||
}, | ||
bases=(models.Model,), | ||
), | ||
migrations.AddField( | ||
model_name='attachment', | ||
name='email', | ||
field=models.ForeignKey(blank=True, to='mailqueue.MailerMessage', null=True), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# encoding: utf-8 | ||
import 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 'MailerMessage' | ||
db.create_table('mailqueue_mailermessage', ( | ||
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
('subject', self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True)), | ||
('to_address', self.gf('django.db.models.fields.EmailField')(max_length=250)), | ||
('from_address', self.gf('django.db.models.fields.EmailField')(max_length=250)), | ||
('content', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), | ||
('app', self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True)), | ||
('sent', self.gf('django.db.models.fields.BooleanField')(default=False)), | ||
)) | ||
db.send_create_signal('mailqueue', ['MailerMessage']) | ||
|
||
|
||
def backwards(self, orm): | ||
|
||
# Deleting model 'MailerMessage' | ||
db.delete_table('mailqueue_mailermessage') | ||
|
||
|
||
models = { | ||
'mailqueue.mailermessage': { | ||
'Meta': {'object_name': 'MailerMessage'}, | ||
'app': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}), | ||
'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
'from_address': ('django.db.models.fields.EmailField', [], {'max_length': '250'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'sent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
'subject': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}), | ||
'to_address': ('django.db.models.fields.EmailField', [], {'max_length': '250'}) | ||
} | ||
} | ||
|
||
complete_apps = ['mailqueue'] |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters