hohoTT
|
77a83f7085
|
Accept Merge Request #58 : (sxw-dev -> dev)
Merge Request: 增加小组功能
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/58
|
2015-08-09 13:01:44 +08:00 |
|
virusdefender
|
6f5c9b1657
|
增加相关的常量的定义以及url参数
|
2015-08-09 12:58:31 +08:00 |
|
virusdefender
|
c4b02270cb
|
创建group app
增加相关的models和views
没有测试
|
2015-08-09 12:57:59 +08:00 |
|
virusdefender
|
f7b6a354b3
|
增加/admin/和/api/admin/的权限控制middleware
|
2015-08-09 12:57:13 +08:00 |
|
virusdefender
|
d7030adc2c
|
去除 announcement.js 中的全局变量
|
2015-08-08 23:11:50 +08:00 |
|
virusdefender
|
fd0514b428
|
更新 problem 和 contest 的 models
|
2015-08-08 23:04:08 +08:00 |
|
virusdefender
|
5d30b9f46d
|
后台监控页面样式修改
|
2015-08-08 23:03:10 +08:00 |
|
virusdefender
|
0afd929c30
|
Merge branch 'dev' into virusdefender-dev
* dev:
[前端] 修改announcement模块轻微问题 1. 去掉翻页函数多余的参数 2.去掉新增公告刷新函数调用时多传的参数 3.去掉模板空的style标签 [CI SKIP]
[功能] 新增公告管理模块,对GET users API轻微修改,筛管理员添加超级管理员包含
修改了用户编辑密码时,密码是否编辑的两个测试用例
admin/views里里面的typo
修复合并后的冲突
创建account的数据库migration
修复announcement js中作用域的问题
并没有改动。。。。 [CI SKIP]
[后端]修改后端公告GET接口,增加返回公告总条数,总页数
[前端-公告管理]增加仅显示可见公告功能,统一数据获取方法
后台页面小bug修复
|
2015-08-08 22:44:30 +08:00 |
|
virusdefender
|
2da1e1426f
|
增加图表的 css 样式
|
2015-08-08 22:42:19 +08:00 |
|
virusdefender
|
cfd56ab582
|
Merge branch 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj into virusdefender-dev
* 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj:
|
2015-08-08 22:41:18 +08:00 |
|
virusdefender
|
e9161e8779
|
改进监控页面样式,增加 chart.js 库文件
|
2015-08-08 22:40:12 +08:00 |
|
hohoTT
|
3a1f26cb83
|
Accept Merge Request #50 : (sxw-dev -> dev)
Merge Request: 新增用户管理-用户列表前端,小bug修复
Created By: @esp
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/50
|
2015-08-08 17:16:06 +08:00 |
|
sxw
|
94fecc14f3
|
[前端] 修改announcement模块轻微问题
1. 去掉翻页函数多余的参数
2.去掉新增公告刷新函数调用时多传的参数
3.去掉模板空的style标签
[CI SKIP]
|
2015-08-08 17:11:36 +08:00 |
|
sxw
|
4578426f99
|
[功能] 新增公告管理模块,对GET users API轻微修改,筛管理员添加超级管理员包含
|
2015-08-08 17:09:15 +08:00 |
|
esp
|
c3fcb119c4
|
Accept Merge Request #49 : (hohoTT-dev -> dev)
Merge Request: 修改了用户编辑密码时,密码是否编辑的两个测试用例
Created By: @hohoTT
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/49
|
2015-08-08 16:45:12 +08:00 |
|
hohoTT
|
1b8d7d3ad5
|
修改了用户编辑密码时,密码是否编辑的两个测试用例
|
2015-08-08 14:59:42 +08:00 |
|
esp
|
9f11ec3943
|
Accept Merge Request #48 : (sxw-dev -> dev)
Merge Request: 修复typo
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/48
|
2015-08-08 12:54:51 +08:00 |
|
sxw
|
ad818d1cbd
|
admin/views里里面的typo
|
2015-08-08 12:53:58 +08:00 |
|
esp
|
f4b84652fe
|
Accept Merge Request #46 : (sxw-dev -> dev)
Merge Request: 修复代码中的冲突
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/46
|
2015-08-08 12:29:33 +08:00 |
|
sxw
|
31b9367a87
|
修复合并后的冲突
|
2015-08-08 12:28:29 +08:00 |
|
esp
|
139a1b74f5
|
Accept Merge Request #45 : (sxw-dev -> dev)
Merge Request: 更新后台announcement的功能
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/45
|
2015-08-08 12:27:03 +08:00 |
|
sxw
|
31bb8590ad
|
创建account的数据库migration
|
2015-08-08 12:23:01 +08:00 |
|
sxw
|
9da0716848
|
修复announcement js中作用域的问题
|
2015-08-08 12:22:47 +08:00 |
|
sxw
|
fcd5caae02
|
Merge branch 'dev' into sxw-dev
Conflicts:
template/admin/announcement/announcement.html
|
2015-08-08 11:31:20 +08:00 |
|
virusdefender
|
7555f959a6
|
Accept Merge Request #44 : (virusdefender-dev -> dev)
Merge Request: 后台模板加载问题修复
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/44
|
2015-08-08 09:45:29 +08:00 |
|
virusdefender
|
aad9b305ef
|
增加服务器监控的对应 js 也 demo 页面
|
2015-08-08 09:44:15 +08:00 |
|
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 |
|