Merge branch 'dev-sxw' of https://git.coding.net/virusdefender/qduoj

Conflicts: contest/views.py template/src/oj/contest/contest_rank.html template/src/oj/contest/submissions_list.html
2015-09-15 13:18:36 +08:00
parent 0f6c822aff 5066a39312
commit befad67dbf
48 changed files with 1117 additions and 2892 deletions
--- a/static/src/js/app/oj/account/change_password.js
+++ b/static/src/js/app/oj/account/change_password.js
--- a/static/src/js/app/oj/contest/contest_password.js
+++ b/static/src/js/app/oj/contest/contest_password.js
--- a/static/src/js/app/oj/problem/problem_list.js
+++ b/static/src/js/app/oj/problem/problem_list.js
@@ -1,6 +0,0 @@
-require(["jquery", "avalon"], function($, avalon){
-    var vm = avalon.define({
-        $id: "problem_list",
-        problem_list: []
-    })
-});