Merge branch 'dev' into hohoTT-dev

This commit is contained in:
hohoTT
2015-08-17 14:49:35 +08:00
18 changed files with 219 additions and 114 deletions

View File

@@ -17,14 +17,14 @@
<div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label>
<input type="number" name="cpu" class="form-control" ms-duplex="cpu"
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个1-5000的合法整数)" maxlength="5000" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</label>
<input type="number" name="memory" class="form-control" ms-duplex="memory"
<input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>