Merge branch 'dev' into hohoTT-dev

Conflicts: template/src/oj/submission/my_submissions_list.html
2015-09-02 15:46:53 +08:00
parent 93974f03b7 a4433a1cf3
commit 1045a8a007
27 changed files with 359 additions and 174 deletions
--- a/template/src/oj/submission/my_submissions_list.html
+++ b/template/src/oj/submission/my_submissions_list.html
@@ -46,7 +46,7 @@
            </thead>
            <tbody>
            {% for item in submissions %}
-            <tr class="{{ item.result|translate_result_class }}">
+            <tr>
                <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
                    {{ forloop.counter |add:start_id }}</a></th>
                <td>{{ item.create_time }}</td>