Merge branch 'dev' into hohoTT-dev

Conflicts: oj/urls.py
2015-09-17 20:33:16 +08:00
parent 903a36f43d 5fb55221ea
commit 17a0448890
28 changed files with 350 additions and 150 deletions
--- a/template/src/oj/account/login.html
+++ b/template/src/oj/account/login.html
@@ -22,6 +22,7 @@

                <div class="help-block with-errors"></div>
            </div>
+            <div class="form-group" id="captcha-area"></div>
            <div class="form-group">
                <button type="submit" class="btn btn-primary">提交</button>
            </div>