Merge "Use Jira Oauth for user authentication"

3 files changed, 72 insertions, 0 deletions

diff --git a/tools/pharos-dashboard/account/migrations/0002_auto_20160816_1511.py b/tools/pharos-dashboard/account/migrations/0002_auto_20160816_1511.py
new file mode 100644
index 00000000..3fcd989a
--- /dev/null
+++ b/tools/pharos-dashboard/account/migrations/0002_auto_20160816_1511.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-16 15:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='oauth_secret',
+            field=models.CharField(default='', max_length=1024),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='oauth_token',
+            field=models.CharField(default='', max_length=1024),
+            preserve_default=False,
+        ),
+    ]
diff --git a/tools/pharos-dashboard/account/migrations/0003_auto_20160819_1024.py b/tools/pharos-dashboard/account/migrations/0003_auto_20160819_1024.py
new file mode 100644
index 00000000..b648844e
--- /dev/null
+++ b/tools/pharos-dashboard/account/migrations/0003_auto_20160819_1024.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-19 10:24
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0002_auto_20160816_1511'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='userprofile',
+            old_name='pgpkey',
+            new_name='pgp_pupblic_key',
+        ),
+        migrations.RenameField(
+            model_name='userprofile',
+            old_name='sshkey',
+            new_name='ssh_public_key',
+        ),
+    ]
diff --git a/tools/pharos-dashboard/account/migrations/0004_auto_20160819_1055.py b/tools/pharos-dashboard/account/migrations/0004_auto_20160819_1055.py
new file mode 100644
index 00000000..51af0aa9
--- /dev/null
+++ b/tools/pharos-dashboard/account/migrations/0004_auto_20160819_1055.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-19 10:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0003_auto_20160819_1024'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='userprofile',
+            old_name='pgp_pupblic_key',
+            new_name='pgp_public_key',
+        ),
+    ]