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

5 files changed, 81 insertions, 5 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 0000000..6812c34
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,27 @@
+=== 0.6.0 (11-05-2017) ===
+
+* Added a course code field that can be used to search a course.
+* Updated the documentation to describe the course code feature
+* Fixed a bug that prevented redirection based on 'next' parameter after login.
+* Fixed a bug that littered residual system processes created by code evaluators.
+* Added the facility to allow moderators to see and download uploaded assignments.
+* Fixed a bug that prevented teachers of a course from editing Question papers.
+* Added a start time and end time for enrollment of a course.
+* Added the facility to allow moderators to edit the details of a course.
+* Added a test_settings.py file to avoid using the committed migrations and rebuild database from scratch while running tests.
+
+=== 0.5.0 (22-03-2017) ===
+
+* Fixed a bug that prevented question tags from being saved when saving questions.
+* Added new question types: 'String Type', 'Integer Type' and 'Float Type'.
+* Fixed a bug that prevented questions from appearing in the same order as they had been added.
+* Added the feature to allow moderators to check uploaded assignments using code hooks.
+* Added error handling for question json upload.
+* Added mathjax rendering to text boxes.
+* Added migration commands to the script.
+* Added migrations folder to the yaksh app.
+* Removed a function call to datetime.now() to set defaults for quiz start time.
+* Fixed a bug that displayed the elements of stdout testcase output as unicode.
+* Fixed a bug that prevented users from logging in using Google OAuth.
+* Added coverage reports to travis.yml.
+
diff --git a/online_test/__init__.py b/online_test/__init__.py
index 2b8877c..ef7eb44 100644
--- a/online_test/__init__.py
+++ b/online_test/__init__.py
@@ -1 +1 @@
-__version__ = '0.5.0'
+__version__ = '0.6.0'
diff --git a/online_test/settings.py b/online_test/settings.py
index 26449d4..4ca2967 100644
--- a/online_test/settings.py
+++ b/online_test/settings.py
@@ -113,7 +113,6 @@ EMAIL_HOST_USER = 'email_host_user'
 
 EMAIL_HOST_PASSWORD = 'email_host_password'
 
-
 # Set EMAIL_BACKEND to 'django.core.mail.backends.smtp.EmailBackend' in production
 EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
 
@@ -124,6 +123,9 @@ EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
 # For example no_reply@<your_organization>.in can be used.
 SENDER_EMAIL = 'your_email'
 
+# Organisation/Indivudual Name.
+SENDER_NAME = 'your_name'
+
 # This email id will be used by users to send their queries
 # For example queries@<your_organization>.in can be used.
 REPLY_EMAIL = 'your_reply_email'
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])