Merge branch 'dev' into sxw-dev

2015-08-05 19:51:02 +08:00
parent c868441d61 4793d660ea
commit b91ff0688a
13 changed files with 326 additions and 14 deletions
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -15,6 +15,7 @@ var require = {
        submit_code: "app/oj/problem/submit_code",
        contest: "app/admin/contest/contest",
        csrf: "utils/csrf",
+        admin: "app/admin/admin",

        //formValidation 不要在代码中单独使用，而是使用和修改utils/validation
        base: "lib/formValidation/base",