Merge branch 'dev' into hohoTT-dev

Conflicts: template/src/oj/submission/my_submissions_list.html
2015-08-31 14:36:28 +08:00
parent 2252107a80 55fac52c33
commit 93974f03b7
15 changed files with 300 additions and 79 deletions
--- a/submission/tests.py
+++ b/submission/tests.py
@@ -18,7 +18,6 @@ class SubmissionsListPageTest(TestCase):
        self.user.set_password("666666")
        self.user.save()
        self.user2.save()
-        # self.client.login(username="gogoing", password="666666")
        self.submission = Submission.objects.create(user_id=self.user.id,
                                                    language=1,
                                                    code='#include "stdio.h"\nint main(){\n\treturn 0;\n}',