Saarang production merge to master

apps/api/admin.py

@@ -0,0 +1,8 @@
+
+from django.contrib import admin
+
+from apps.api.models import PushNotification, BandHuntTrack, BandHuntVote
+
+admin.site.register(PushNotification)
+admin.site.register(BandHuntTrack)
+admin.site.register(BandHuntVote)

apps/api/migrations/0001_initial.py

@@ -0,0 +1,50 @@
+# -*- 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 'PushNotification'
+        db.create_table(u'api_pushnotification', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('expiry', self.gf('django.db.models.fields.DateTimeField')(default='2015-01-13 23:59')),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('message', self.gf('django.db.models.fields.TextField')(max_length=2000)),
+            ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+            ('dialog_title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('dialog_text', self.gf('django.db.models.fields.TextField')(max_length=1000, null=True, blank=True)),
+            ('dialog_yes', self.gf('django.db.models.fields.TextField')(max_length=50, null=True, blank=True)),
+            ('dialog_no', self.gf('django.db.models.fields.TextField')(max_length=50, null=True, blank=True)),
+            ('min_version', self.gf('django.db.models.fields.IntegerField')(default=200)),
+            ('max_version', self.gf('django.db.models.fields.IntegerField')(default=2000)),
+        ))
+        db.send_create_signal(u'api', ['PushNotification'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'PushNotification'
+        db.delete_table(u'api_pushnotification')
+
+
+    models = {
+        u'api.pushnotification': {
+            'Meta': {'object_name': 'PushNotification'},
+            'dialog_no': ('django.db.models.fields.TextField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'dialog_text': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'dialog_title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'dialog_yes': ('django.db.models.fields.TextField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateTimeField', [], {'default': "'2015-01-13 23:59'"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_version': ('django.db.models.fields.IntegerField', [], {'default': '2000'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+            'min_version': ('django.db.models.fields.IntegerField', [], {'default': '200'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['api']

apps/api/migrations/0002_auto__chg_field_pushnotification_dialog_yes__chg_field_pushnotificatio.py

@@ -0,0 +1,43 @@
+# -*- 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):
+
+        # Changing field 'PushNotification.dialog_yes'
+        db.alter_column(u'api_pushnotification', 'dialog_yes', self.gf('django.db.models.fields.CharField')(max_length=50, null=True))
+
+        # Changing field 'PushNotification.dialog_no'
+        db.alter_column(u'api_pushnotification', 'dialog_no', self.gf('django.db.models.fields.CharField')(max_length=50, null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'PushNotification.dialog_yes'
+        db.alter_column(u'api_pushnotification', 'dialog_yes', self.gf('django.db.models.fields.TextField')(max_length=50, null=True))
+
+        # Changing field 'PushNotification.dialog_no'
+        db.alter_column(u'api_pushnotification', 'dialog_no', self.gf('django.db.models.fields.TextField')(max_length=50, null=True))
+
+    models = {
+        u'api.pushnotification': {
+            'Meta': {'object_name': 'PushNotification'},
+            'dialog_no': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'dialog_text': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'dialog_title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'dialog_yes': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2015, 1, 13, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_version': ('django.db.models.fields.IntegerField', [], {'default': '2000'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+            'min_version': ('django.db.models.fields.IntegerField', [], {'default': '200'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['api']

apps/api/migrations/0003_auto__add_field_pushnotification_status.py

@@ -0,0 +1,40 @@
+# -*- 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 field 'PushNotification.status'
+        db.add_column(u'api_pushnotification', 'status',
+                      self.gf('django.db.models.fields.TextField')(max_length=2000, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'PushNotification.status'
+        db.delete_column(u'api_pushnotification', 'status')
+
+
+    models = {
+        u'api.pushnotification': {
+            'Meta': {'object_name': 'PushNotification'},
+            'dialog_no': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'dialog_text': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'dialog_title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'dialog_yes': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2015, 1, 13, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_version': ('django.db.models.fields.IntegerField', [], {'default': '2000'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+            'min_version': ('django.db.models.fields.IntegerField', [], {'default': '200'}),
+            'status': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['api']

apps/api/migrations/0004_auto__chg_field_pushnotification_url.py

@@ -0,0 +1,38 @@
+# -*- 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):
+
+        # Changing field 'PushNotification.url'
+        db.alter_column(u'api_pushnotification', 'url', self.gf('django.db.models.fields.CharField')(max_length=500))
+
+    def backwards(self, orm):
+
+        # Changing field 'PushNotification.url'
+        db.alter_column(u'api_pushnotification', 'url', self.gf('django.db.models.fields.URLField')(max_length=200))
+
+    models = {
+        u'api.pushnotification': {
+            'Meta': {'object_name': 'PushNotification'},
+            'dialog_no': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'dialog_text': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'dialog_title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'dialog_yes': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2015, 1, 13, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_version': ('django.db.models.fields.IntegerField', [], {'default': '2000'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+            'min_version': ('django.db.models.fields.IntegerField', [], {'default': '200'}),
+            'status': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        }
+    }
+
+    complete_apps = ['api']

apps/api/migrations/0005_auto__add_bandhuntvote__add_bandhunttrack.py

@@ -0,0 +1,108 @@
+# -*- 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 'BandHuntVote'
+        db.create_table(u'api_bandhuntvote', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('track', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.BandHuntTrack'])),
+        ))
+        db.send_create_signal(u'api', ['BandHuntVote'])
+
+        # Adding model 'BandHuntTrack'
+        db.create_table(u'api_bandhunttrack', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('url', self.gf('django.db.models.fields.TextField')(max_length=2000, null=True, blank=True)),
+            ('embed_code', self.gf('django.db.models.fields.TextField')(max_length=2000, null=True, blank=True)),
+            ('track_id', self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True)),
+        ))
+        db.send_create_signal(u'api', ['BandHuntTrack'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'BandHuntVote'
+        db.delete_table(u'api_bandhuntvote')
+
+        # Deleting model 'BandHuntTrack'
+        db.delete_table(u'api_bandhunttrack')
+
+
+    models = {
+        u'api.bandhunttrack': {
+            'Meta': {'object_name': 'BandHuntTrack'},
+            'embed_code': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'track_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'})
+        },
+        u'api.bandhuntvote': {
+            'Meta': {'object_name': 'BandHuntVote'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'track': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.BandHuntTrack']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'api.pushnotification': {
+            'Meta': {'object_name': 'PushNotification'},
+            'dialog_no': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'dialog_text': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'dialog_title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'dialog_yes': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2015, 1, 13, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_version': ('django.db.models.fields.IntegerField', [], {'default': '2000'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+            'min_version': ('django.db.models.fields.IntegerField', [], {'default': '200'}),
+            'status': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'default': "'content://com.saarang.samples.apps.iosched/sessions'", 'max_length': '500'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['api']