 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 |
|
sw
|
d655becf7b
|
Merge branch 'szzh' into develop
|
2015-07-24 08:59:18 +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
|
7eb25867e9
|
Merge branch 'dev_hjq' into develop
|
2015-07-23 10:38:27 +08:00 |
|
huang
|
6911debad0
|
Merge branch 'develop' into dev_hjq
|
2015-07-23 10:37:52 +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
|
62a6478902
|
Merge branch 'develop' into szzh
|
2015-07-23 10:16:33 +08:00 |
|
sw
|
69024b2489
|
编程作业编译出错时错误信息的显示
|
2015-07-23 10:14:55 +08:00 |
|
sw
|
61cbfc90ff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-23 10:14:11 +08:00 |
|
sw
|
c0eea86132
|
增加错误信息的显示
|
2015-07-23 10:12:07 +08:00 |
|
huang
|
a57aac0b72
|
Merge branch 'szzh' into develop
|
2015-07-23 09:46:59 +08:00 |
|
huang
|
d1359d1e55
|
Merge branch 'szzh' into dev_hjq
|
2015-07-23 09:10:51 +08:00 |
|
huang
|
8312798cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-23 09:06:54 +08:00 |
|
huang
|
fc8a81c46d
|
Merge branch 'develop' into szzh
|
2015-07-23 09:06:37 +08:00 |
|
sw
|
61808a5152
|
Merge branch 'develop' into szzh
|
2015-07-23 09:00:48 +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
|
d36e82241b
|
Merge branch 'szzh' into develop
|
2015-07-23 08:57:14 +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
|
3d774598a5
|
Merge branch 'develop' into szzh
|
2015-07-22 17:13:35 +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
|
dd86c769b5
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-07-22 16:08:34 +08:00 |
|
sw
|
d5403ce495
|
Merge branch 'szzh' into develop
|
2015-07-22 16:07:21 +08:00 |
|
sw
|
b098955565
|
Merge branch 'develop' into szzh
|
2015-07-22 16:06:49 +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 |
|
huang
|
86fb9710ef
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-07-22 12:18:54 +08:00 |
|
huang
|
4c0995d9e8
|
Merge branch 'szzh' into develop
|
2015-07-22 12:18:28 +08:00 |