 huang
|
683456dc3a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-07-24 16:56:50 +08:00 |
|
huang
|
69b9cbee80
|
版本库代码统计（未完成）
|
2015-07-24 16:56:37 +08:00 |
 guange
|
71970e1942
|
支持按时间段来统计每人的提交量
|
2015-07-24 16:53:21 +08:00 |
 zhangshenjerry
|
f0e8d545dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-24 16:34:08 +08:00 |
|
zhangshenjerry
|
6b3882aff8
|
个人主页：如图值为0时，这些字段不要显示
|
2015-07-24 16:33:53 +08:00 |
 sw
|
6c894e63ee
|
添加、修改分班的长度限定为20
|
2015-07-24 15:54:09 +08:00 |
|
sw
|
caec634e4c
|
Merge branch 'szzh' into develop
|
2015-07-24 15:19:36 +08:00 |
|
sw
|
e44b31d450
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-24 15:19:16 +08:00 |
|
sw
|
4f8170700e
|
增加开发语言的显示
|
2015-07-24 15:19:01 +08:00 |
|
huang
|
391c7f6821
|
Merge branch 'szzh' into dev_hjq
|
2015-07-24 15:02:57 +08:00 |
|
huang
|
390aa632cd
|
修改删除主版本库后，新建可以设置主版本库
|
2015-07-24 15:02:01 +08:00 |
|
sw
|
4a781ea6b2
|
个人主页，助教不可以关闭课程。修改张生代码
|
2015-07-24 14:36:53 +08:00 |
|
sw
|
cf58ea8a9f
|
密码修改成功提示错误
|
2015-07-24 14:31:08 +08:00 |
|
sw
|
7f8f957a71
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-24 14:27:45 +08:00 |
|
sw
|
24a9a5034c
|
编程作业取消导出附件按钮
|
2015-07-24 14:27:30 +08:00 |
|
zhangshenjerry
|
d38b840c4b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-24 14:00:50 +08:00 |
|
zhangshenjerry
|
2f497f36d0
|
正确修改密码后建议给出“密码修改成功，请重新登录”的提示信息
|
2015-07-24 14:00:02 +08:00 |
|
sw
|
0e56a79622
|
课程通知查询不使用ajax局部刷新
|
2015-07-24 11:50:50 +08:00 |
 lizanle
|
f521ca424d
|
首页动态优化
|
2015-07-24 11:47:45 +08:00 |
|
huang
|
938d31a761
|
项目得分为0 的时候不显示项目得分
|
2015-07-24 11:36:21 +08:00 |
|
lizanle
|
a4734bb135
|
首页动态优化
|
2015-07-24 11:13:53 +08:00 |
|
lizanle
|
ce16550545
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-24 10:56:25 +08:00 |
|
lizanle
|
c8cb730397
|
首页动态优化
|
2015-07-24 10:56:19 +08:00 |
|
huang
|
bf86393bb9
|
项目自定义主页，添加图片删除功能
|
2015-07-24 10:39:07 +08:00 |
|
huang
|
ad43c76ce7
|
修改项目首页可配置
包括图片大小、描述
|
2015-07-24 10:21:52 +08:00 |
|
huang
|
b6812d8810
|
Merge branch 'szzh' into dev_hjq
|
2015-07-24 09:49:06 +08:00 |
|
huang
|
e5801338d6
|
修改最近一个月时间跨度
当前日期延生到上月的当天
|
2015-07-24 09:47:28 +08:00 |
|
sw
|
f4360e66dd
|
编辑编程作业出错
|
2015-07-24 09:47:20 +08:00 |
|
lizanle
|
e85ef7b192
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-24 09:38:03 +08:00 |
|
lizanle
|
8350d5f10b
|
首页动态优化
|
2015-07-24 09:37:53 +08:00 |
|
huang
|
2fca0f4441
|
提交次数代码简化
|
2015-07-24 09:32:12 +08:00 |
|
sw
|
ea8f72cce9
|
编程作业show：两个测试结果
|
2015-07-24 09:24:09 +08:00 |
|
huang
|
c0da9257cd
|
版本库：用户最近六个月提交次数
|
2015-07-24 09:19:43 +08:00 |
|
huang
|
127a243bd2
|
版本库：用户最近一月提交次数统计
|
2015-07-24 09:18:34 +08:00 |
 cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-24 09:07:58 +08:00 |
|
sw
|
9d07987826
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-07-24 09:00:46 +08:00 |
|
sw
|
3f1852985e
|
编程作业创建页面跳转
|
2015-07-24 09:00:08 +08:00 |
|
zhangshenjerry
|
d639942b82
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
app/views/layouts/base_users_new.html.erb
|
2015-07-24 08:58:56 +08:00 |
|
zhangshenjerry
|
1b3c6bde69
|
个人主页--留言文本框修改
|
2015-07-24 08:56:19 +08:00 |
|
huang
|
a2c2f41908
|
版本库：最近一月的提交次数统计
|
2015-07-23 17:32:48 +08:00 |
|
sw
|
4ce693ad17
|
课程讨论区发送邮件增加
|
2015-07-23 16:49:54 +08:00 |
|
sw
|
b781d22a62
|
删除课程过滤器中没有的方法，增加删除课程的action
|
2015-07-23 16:17:13 +08:00 |
|
sw
|
ce17cb1da0
|
个人主页，TA的课程显示和课程数量、课程列表不匹配
|
2015-07-23 15:13:18 +08:00 |
|
cxt
|
8fba66d330
|
3251缺陷的修复
|
2015-07-23 15:02:26 +08:00 |
|
sw
|
6775008b50
|
加入课程数和创建课程数不正确
去除掉无用代码
|
2015-07-23 14:42:47 +08:00 |
|
sw
|
76247d74a7
|
公共贴吧 顶和踩之后数字未变化
|
2015-07-23 10:50:48 +08:00 |
|
huang
|
8f02626183
|
删除云化部署进度条，显示成等待
|
2015-07-23 10:36:51 +08:00 |
|
sw
|
c2d41ab8db
|
编程作业的上线
|
2015-07-23 10:34:44 +08:00 |
|
sw
|
95af2ab20b
|
作品列表界面导出列表功能：
普通作业：不显示匿评评分
匿评作业：显示匿评评分
编程作业：显示系统评分
|
2015-07-23 10:33:54 +08:00 |
|
sw
|
f4786ea71f
|
学生列表加入时间对齐
|
2015-07-23 10:23:27 +08:00 |
|
huang
|
6cbafb66d9
|
版本库添加统计说明
|
2015-07-23 10:20:32 +08:00 |
|
sw
|
69024b2489
|
编程作业编译出错时错误信息的显示
|
2015-07-23 10:14:55 +08:00 |
|
sw
|
c0eea86132
|
增加错误信息的显示
|
2015-07-23 10:12:07 +08:00 |
|
sw
|
7cf837d0bf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-07-23 08:59:16 +08:00 |
|
sw
|
c1824a6db0
|
修改编程作业发送
|
2015-07-22 17:47:48 +08:00 |
 yutao
|
74c50e155a
|
个人主页的加入课程为-1
|
2015-07-22 17:46:37 +08:00 |
|
sw
|
ffee6d27a6
|
取消编程作业
|
2015-07-22 17:16:28 +08:00 |
|
sw
|
7d3a9adfcd
|
修改编程作业语言不成功
|
2015-07-22 17:00:41 +08:00 |
|
cxt
|
a285c6a536
|
3247缺陷的修复
|
2015-07-22 16:57:23 +08:00 |
|
cxt
|
313b5d1ac0
|
3245缺陷的修复
|
2015-07-22 16:39:26 +08:00 |
|
huang
|
44f54d0f79
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-07-22 16:39:11 +08:00 |
|
huang
|
4b923c540d
|
修改主版本库丢失的404问题
|
2015-07-22 16:38:52 +08:00 |
|
yutao
|
987a8da994
|
个人主页的“访客”先隐藏，仅对超级管理员开放
|
2015-07-22 16:38:01 +08:00 |
|
sw
|
01576449c8
|
编译结果显示错误
|
2015-07-22 16:33:27 +08:00 |
|
sw
|
66924560c4
|
编程作业上线
|
2015-07-22 16:06:31 +08:00 |
|
yutao
|
5e643e7316
|
个人主页的学生真实姓名：暂时先隐藏，教师可以公开
|
2015-07-22 15:59:22 +08:00 |
|
cxt
|
dc11ad31f1
|
3241缺陷的修复
|
2015-07-22 15:38:56 +08:00 |
|
zhangshenjerry
|
acebefc987
|
个人主页-助教关闭课程不能不可用
|
2015-07-22 11:00:04 +08:00 |
|
lizanle
|
ffe12b92c8
|
课程主题可以搜索
|
2015-07-22 10:23:14 +08:00 |
|
lizanle
|
b8670449c6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-22 10:22:59 +08:00 |
|
lizanle
|
b148f75dc9
|
课程主题可以搜索
|
2015-07-22 10:22:50 +08:00 |
|
sw
|
faeee62331
|
Merge branch 'szzh' into develop
|
2015-07-22 10:20:45 +08:00 |
|
sw
|
5c9871d20e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-22 10:18:23 +08:00 |
|
sw
|
ec4395c30c
|
修改作品权限对admin用户公开
|
2015-07-22 10:18:01 +08:00 |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
2015-07-22 10:06:55 +08:00 |
|
huang
|
ae4eed45c3
|
添加 新项目工具
|
2015-07-22 10:05:21 +08:00 |
|
sw
|
d9f312bbe3
|
1、当作品描述为空时，打开作品报错
2、作品名称为空时，默认显示作品名为：XX的作品
|
2015-07-22 09:56:27 +08:00 |
|
sw
|
45dd135c81
|
创建作业报500
|
2015-07-21 16:39:23 +08:00 |
|
sw
|
9a4a159463
|
继续取消编程作业
|
2015-07-21 16:34:48 +08:00 |
|
huang
|
71b6d3a5c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-21 16:02:10 +08:00 |
|
huang
|
650f485f4b
|
Merge branch 'develop' into dev_hjq
|
2015-07-21 15:59:02 +08:00 |
|
sw
|
70b822a641
|
Merge branch 'develop' into szzh
|
2015-07-21 15:54:28 +08:00 |
|
huang
|
9eb8c7e712
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-21 15:53:06 +08:00 |
|
huang
|
c675db9381
|
修改云部署路径
|
2015-07-21 15:52:45 +08:00 |
|
sw
|
bb08c7160f
|
编程作业部分报500
|
2015-07-21 15:52:40 +08:00 |
|
yutao
|
8c47e6ca1f
|
个人主页--“我的课程”、“我的项目”不是下拉框却做成下拉框的样式
|
2015-07-21 15:47:54 +08:00 |
|
huang
|
5e79288d49
|
修改dts样式
|
2015-07-21 15:47:53 +08:00 |
|
sw
|
d0e564a589
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-21 15:40:48 +08:00 |
|
sw
|
cfbd50e474
|
student_work和student_work_test关系：1对多
|
2015-07-21 15:39:48 +08:00 |
|
lizanle
|
ec877c9044
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-21 15:16:21 +08:00 |
|
lizanle
|
3c27bf0281
|
移动端版本 管理 可以下载
|
2015-07-21 15:16:13 +08:00 |
|
sw
|
b13e9f918c
|
取消最后一列得分显示
|
2015-07-21 15:15:38 +08:00 |
|
sw
|
742cdb2448
|
编程作业支持C++代码
|
2015-07-21 15:09:52 +08:00 |
|
cxt
|
266e936d67
|
3227缺陷已修复
|
2015-07-21 14:10:56 +08:00 |
|
huang
|
b05478e71d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-21 13:11:13 +08:00 |
|
huang
|
753caea5ab
|
DTS数据存在一张表中
云化部署路径改变
|
2015-07-21 13:10:02 +08:00 |
|
lizanle
|
6f773b902b
|
移动端版本 管理 可以下载
|
2015-07-21 11:59:25 +08:00 |
|
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
2015-07-21 11:59:15 +08:00 |
|
lizanle
|
28ca4d2be2
|
移动端版本 管理 可以下载
|
2015-07-21 11:59:09 +08:00 |
|
yutao
|
83bbb62149
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-21 11:19:43 +08:00 |