Merge https://github.com/fossee/online_test into bulk_email

2 files changed, 50 insertions, 3 deletions

diff --git a/yaksh/migrations/0006_release_0_6_0.py b/yaksh/migrations/0006_release_0_6_0.py
new file mode 100644
index 0000000..335ac23
--- /dev/null
+++ b/yaksh/migrations/0006_release_0_6_0.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2017-05-11 09:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0005_auto_20170410_1024'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='course',
+            name='code',
+            field=models.CharField(blank=True, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='hidden',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='activation_key',
+            field=models.CharField(blank=True, max_length=40, null=True),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='is_email_verified',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='key_expiry_time',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='course',
+            name='enrollment',
+            field=models.CharField(choices=[('default', 'Enroll Request'), ('open', 'Open Enrollment')], max_length=32),
+        ),
+    ]
diff --git a/yaksh/send_emails.py b/yaksh/send_emails.py
index bcf633f..20d6f02 100644
--- a/yaksh/send_emails.py
+++ b/yaksh/send_emails.py
@@ -41,9 +41,11 @@ def send_user_mail(user_mail, key):
                 copy and paste the URL in a new browser window instead.
                 For any issue, please write us on {2}
 
-                Regards
-                Yaksh Team
-            """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL)
+                Regards,
+                {3}
+            """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL,
+                       settings.SENDER_NAME
+                       )
             )
 
         send_mail(subject, message, settings.SENDER_EMAIL, [to])