xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into virusdefender-dev

Browse Source 
* dev:
  修改主页部分字词
  修改部分设置，为上线做准备
  [修复]后台比赛管理编辑,后端传来的是utc时间,因为开始,结束时间跟创建,修改时间的处理方法是不同的,我通过修改前端代码解决了该问题.但是比较繁琐,因为在前端这个日期使用字符串来存储的.而后端虽是datetime类型,但返回的是比赛的数组,若要处理也较繁琐,且暂没找到简洁的写法.于是还是选择了改前端,其实实质上是手工给时间加了8小时.....[CI SKIP]

Conflicts:
	oj/server_settings.py
This commit is contained in:
virusdefender
2015-08-31 16:56:21 +08:00
parent 333c4ba24d eb07e8300f
commit 2033daf46f
5 changed files with 97 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oj/settings.py
View File

@@ -164,4 +164,6 @@ LOGGING = {
REST_FRAMEWORK = {
'TEST_REQUEST_DEFAULT_FORMAT': 'json'
}
}
DATABASE_ROUTERS = ['oj.db_router.DBRouter']