QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 16:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
439 Commits 8 Branches 14 Tags 24 MiB
76b28f2da2
Commit Graph

439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
virusdefender
fff7fae323 修复模板重复加载的问题 
需要在 avalon.ready()之后再进行其他动作，需要先初始化模板路径。
 2015-08-08 09:43:32 +08:00
sxw
3b2ea92616 Merge branch 'dev' into sxw-dev 2015-08-08 08:47:33 +08:00
sxw
47e63d5c73 并没有改动。。。。 [CI SKIP] 2015-08-08 08:46:54 +08:00
sxw
fc57dcbde4 [后端]修改后端公告GET接口，增加返回公告总条数，总页数 2015-08-08 08:41:20 +08:00
sxw
a03b8af79d [前端-公告管理]增加仅显示可见公告功能，统一数据获取方法 2015-08-08 08:39:37 +08:00
virusdefender
6e8baca8c9 django rest framework 3.2之后使用 request.data代替 request.DATA 2015-08-07 22:01:16 +08:00
virusdefender
f55517d7c6 修复 ci migrate 错误 2015-08-07 21:52:22 +08:00
hohoTT
31479283ce Accept Merge Request #43 : (hohoTT-dev -> dev) 
Merge Request: 增加了用户管理和编辑的API及相应的测试
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/43
 2015-08-07 20:32:06 +08:00
hohoTT
8e5920321e Merge branch 'dev' into hohoTT-dev 2015-08-07 20:27:53 +08:00
hohoTT
69385e96d2 增加了用户管理和编辑的API及相应的测试 2015-08-07 20:25:58 +08:00
hohoTT
d64b99eed3 增加了用visible搜索公告的功能，并增加了相应的测试 2015-08-07 20:25:06 +08:00
sxw
43238072ae Merge branch 'dev' into sxw-dev 2015-08-07 20:03:30 +08:00
virusdefender
d3e4933865 Merge branch 'virusdefender-dev' into dev 
* virusdefender-dev:
  后台 admin 模板样式优化
 2015-08-07 20:02:29 +08:00
virusdefender
01b13bf823 后台 admin 模板样式优化 2015-08-07 20:02:08 +08:00
sxw
324e72c231 后台页面小bug修复 
包括按钮的距离，模板的css等
 2015-08-07 19:46:46 +08:00
esp
d5fe1a98dc Accept Merge Request #42 : (sxw-dev -> dev) 
Merge Request: 增加后台公告管理的界面和相关的js
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/42
 2015-08-07 19:30:54 +08:00
sxw
76e3188360 Merge branch 'dev' into sxw-dev 
Conflicts:
	template/admin/admin.html
 2015-08-07 19:28:24 +08:00
sxw
7375bda40c [前端]: 添加了admin公告管理页面以及相应的js，包含公告显示，修改，新建 2015-08-07 19:20:19 +08:00
virusdefender
a1686d4015 Accept Merge Request #41 : (virusdefender-dev -> dev) 
Merge Request: 后台模板加载优化
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/41
 2015-08-07 18:32:51 +08:00
virusdefender
b1a935a894 将创建 contest 的页面修改为新的动态加载的方式 2015-08-07 17:13:44 +08:00
virusdefender
1d639d1203 修复后台左侧导航栏的 hash 和 li class 还有模板路径对应关系错误的 bug 2015-08-07 17:13:09 +08:00
virusdefender
2475407597 前台网页增加新的 class，修复 footer 显示位置错误的问题 2015-08-07 17:12:08 +08:00
virusdefender
a66b755aa3 修复 footer 显示位置错误的问题 2015-08-07 17:11:20 +08:00
sxw
2a29dfffb4 添加公告管理的js 2015-08-07 09:24:52 +08:00
virusdefender
d54a7bf818 Merge branch 'dev' into virusdefender-dev 
* dev:
  添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试
 2015-08-06 23:48:19 +08:00
virusdefender
d6a36fe20c 增加模板加载效果和对应的 js 控制 2015-08-06 23:47:54 +08:00
virusdefender
ab63ac652f 分离公共 js；修改 footer 效果，固定在底部 2015-08-06 23:47:28 +08:00
virusdefender
f94598bdad Accept Merge Request #40 : (hohoTT-dev -> dev) 
Merge Request: 添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/40
 2015-08-06 19:10:04 +08:00
hohoTT
1675eed67d 添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试 2015-08-06 19:07:46 +08:00
sxw
b6d27f4383 Merge branch 'dev' into sxw-dev 2015-08-06 16:52:15 +08:00
virusdefender
290212d408 Accept Merge Request #39 : (virusdefender-dev -> dev) 
Merge Request: 修复 announcement url 前缀错误；修复 api doc 格式错误
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/39
 2015-08-06 16:50:21 +08:00
virusdefender
529cea5476 修复 announcement url 前缀错误；修复 api doc 格式错误 2015-08-06 16:49:48 +08:00
sxw
79360a1a56 Merge branch 'dev' into sxw-dev 2015-08-06 16:47:59 +08:00
virusdefender
58cf3d256f Accept Merge Request #38 : (virusdefender-dev -> dev) 
Merge Request: fix-bug 修复 account migrate 冲突
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/38
 2015-08-06 16:46:28 +08:00
virusdefender
e0dec79066 fix-bug 修复 account migrate 冲突 2015-08-06 16:45:51 +08:00
sxw
7d7b025a8b Merge branch 'dev' into sxw-dev 2015-08-06 16:34:41 +08:00
sxw
8e8909973e 取消username，email字段失去焦点再发送验证请求 2015-08-06 16:33:37 +08:00
hohoTT
bc874883c7 Accept Merge Request #37 : (hohoTT-dev -> dev) 
Merge Request: 增加了公告发布成功的测试，以及公告分页的APIview
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/37
 2015-08-06 16:30:17 +08:00
hohoTT
844e970276 增加了公告发布成功的测试，以及公告分页的APIview 2015-08-06 16:28:59 +08:00
sxw
65dfd1149b 修复了关于电子邮箱地址是否存在前后端数据标准差异 
修改前端逻辑，先判断code
 2015-08-06 15:12:28 +08:00
hohoTT
96c8d28c64 announcement model.py 里面增加一个新的字段（最后更新时间） 2015-08-06 13:17:15 +08:00
virusdefender
20f523c0f5 Accept Merge Request #36 : (virusdefender-dev -> dev) 
Merge Request: bug-fix: 增加 account/models 的 migration
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/36
 2015-08-06 13:06:06 +08:00
virusdefender
53afd2a032 bug-fix: 增加 account/models 的 migration 2015-08-06 13:05:00 +08:00
hohoTT
a07441ce24 Merge branch 'dev' into hohoTT-dev 2015-08-06 12:39:06 +08:00
virusdefender
f1d18a0d46 Accept Merge Request #29 : (virusdefender-dev -> dev) 
Merge Request: 登录页面优化
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/29
 2015-08-06 12:27:01 +08:00
virusdefender
62f07e713f 增加 @admin_required 修饰符代码和对应的测试 2015-08-06 12:25:16 +08:00
hohoTT
2bf0389e7b announcement model.py 里面的 description 改名为 content,并修改其对应的serializers和views 2015-08-06 11:08:02 +08:00
virusdefender
875e3b1671 将注册页面用户名和密码的验证改为了输入框失去焦点的时候才验证，防止发送大量请求。 
增加注册的时候向后端发送邮箱字段。
整理 js 代码风格。
 2015-08-06 09:43:14 +08:00
virusdefender
94d33aede6 Accept Merge Request #26 : (hohoTT-dev -> dev) 
Merge Request: 增加了三个新的功能，去除account/tests.py中不必要的代码
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/26
 2015-08-05 20:26:38 +08:00
hohoTT
98f8b65011 在account/tests.py中删除不必要的代码 2015-08-05 20:23:42 +08:00