diff options
author | mahesh | 2017-05-15 15:00:57 +0530 |
---|---|---|
committer | mahesh | 2017-05-15 15:00:57 +0530 |
commit | cb1655ea467cf6ed673ed422719c87f2c861723a (patch) | |
tree | 1a11405075173598461201d2bd93df66acc110de /yaksh | |
parent | 3bbaa1e17778fb3790a9546d365444c38df31e1a (diff) | |
parent | 7baaa70c0e7f660ad7482c3c3950eab171b27cd3 (diff) | |
download | online_test-cb1655ea467cf6ed673ed422719c87f2c861723a.tar.gz online_test-cb1655ea467cf6ed673ed422719c87f2c861723a.tar.bz2 online_test-cb1655ea467cf6ed673ed422719c87f2c861723a.zip |
Merge branch 'master' of https://github.com/fossee/online_test into difflib
Diffstat (limited to 'yaksh')
-rw-r--r-- | yaksh/migrations/0006_release_0_6_0.py | 45 | ||||
-rw-r--r-- | yaksh/send_emails.py | 8 |
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 37736d5..8983024 100644 --- a/yaksh/send_emails.py +++ b/yaksh/send_emails.py @@ -38,9 +38,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]) |