diff --git a/flashcards/migrations/0019_auto_20150602_0826.py b/flashcards/migrations/0019_auto_20150602_0826.py new file mode 100644 index 0000000..bde1f98 --- /dev/null +++ b/flashcards/migrations/0019_auto_20150602_0826.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('flashcards', '0018_flashcard_score'), + ] + + operations = [ + migrations.AlterField( + model_name='flashcard', + name='score', + field=models.FloatField(default=0), + ), + ] diff --git a/flashcards/migrations/0020_merge.py b/flashcards/migrations/0020_merge.py new file mode 100644 index 0000000..302a455 --- /dev/null +++ b/flashcards/migrations/0020_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('flashcards', '0019_auto_20150602_0826'), + ('flashcards', '0019_auto_20150602_1046'), + ] + + operations = [ + ] diff --git a/flashcards/models.py b/flashcards/models.py index ef94449..67b487b 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -101,7 +101,7 @@ class User(AbstractUser, SimpleEmailConfirmationUserMixin): gcm = GCM(GCM_API_KEY) gcm.plaintext_request( registration_id=self.registration_id, - data="You have flashcards to study!" + data={'poop': 'data'} ) self.last_notified = now() self.save()