 nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-30 17:26:25 +08:00 |
|
nwb
|
e863c30352
|
部分BUG修正
|
2014-06-30 17:26:11 +08:00 |
 z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
2014-06-30 16:19:28 +08:00 |
 sw
|
f6d9bfc91d
|
修改新建作业时传递参数
|
2014-06-30 11:15:52 +08:00 |
|
sw
|
be2faea15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/bids_controller.rb
app/views/courses/new_homework.html.erb
|
2014-06-30 11:15:25 +08:00 |
|
nwb
|
25a3114a5a
|
老师的学生列表显示为真实姓名
|
2014-06-27 16:44:53 +08:00 |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
2014-06-27 15:58:41 +08:00 |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
2014-06-27 15:35:55 +08:00 |
|
nwb
|
99c9f81aea
|
BUG修正
|
2014-06-27 15:26:42 +08:00 |
|
nwb
|
1a4ee62853
|
修正课程错误信息显示2遍的问题
|
2014-06-27 14:17:21 +08:00 |
|
nwb
|
ad97066a45
|
课程名称有效性判断
|
2014-06-27 11:42:45 +08:00 |
|
nwb
|
c0f0e294e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-27 11:25:00 +08:00 |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
2014-06-27 11:24:48 +08:00 |
|
z9hang
|
0717148a0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-27 11:15:20 +08:00 |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
2014-06-27 11:15:10 +08:00 |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
2014-06-27 10:50:23 +08:00 |
|
sw
|
09d79ae4e0
|
添加作业增加默认日期为当前时间的下一天
|
2014-06-27 10:10:30 +08:00 |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:18 +08:00 |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:21 +08:00 |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
2014-06-26 17:55:01 +08:00 |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
2014-06-26 17:49:23 +08:00 |
|
nwb
|
33baf88886
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:47:40 +08:00 |
|
nwb
|
38baa247bf
|
BUG修正
|
2014-06-26 17:47:27 +08:00 |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
2014-06-26 16:47:49 +08:00 |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-06-26 15:15:46 +08:00 |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
2014-06-26 15:05:24 +08:00 |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
2014-06-26 14:58:59 +08:00 |
|
sw
|
dbd5c49246
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 14:48:31 +08:00 |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
2014-06-26 14:47:29 +08:00 |
|
sw
|
91180f922a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 14:45:44 +08:00 |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
2014-06-26 14:42:32 +08:00 |
|
nwb
|
9ae5f59a29
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 11:43:13 +08:00 |
|
nwb
|
f8e5c2358a
|
学生角色添加回复讨论区权限
|
2014-06-26 11:43:03 +08:00 |
|
sw
|
56ce9e8bdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 11:41:10 +08:00 |
|
sw
|
c4b2c47dc7
|
调整作业显示样式
|
2014-06-26 11:40:54 +08:00 |
|
sw
|
12087f40c7
|
1.当作业未选定项目时，项目得分为灰色的N/A，选定了项目，项目得分为橘色的分数
2.当无人对作业进行互评、综评时，作业的互评、综评得分为灰色的N/A，有人进行评分则为橘色的分数
3.简化代码
|
2014-06-26 11:22:48 +08:00 |
|
nwb
|
b4af75f289
|
部分界面优化
|
2014-06-26 11:15:06 +08:00 |
|
sw
|
7702b746c6
|
修复作业显示界面，提交作业按钮不显示的问题
|
2014-06-26 10:55:50 +08:00 |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
2014-06-26 10:01:44 +08:00 |
|
nwb
|
88c3347f7c
|
修正合并分支后的创建课程错误
|
2014-06-26 09:15:56 +08:00 |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
2014-06-26 08:53:16 +08:00 |
|
nwb
|
c5a837c689
|
修改资源文件测试用例
|
2014-06-25 16:26:19 +08:00 |
|
nwb
|
ff67e3dbfe
|
更新测试环境搭建文档
|
2014-06-25 10:40:59 +08:00 |
|
nwb
|
25e30ec604
|
修改文档
|
2014-06-25 10:15:30 +08:00 |
|
nwb
|
241b1f2dc6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-25 09:44:51 +08:00 |
|
nwb
|
1e1ff110fc
|
添加测试说明文档
|
2014-06-25 09:44:35 +08:00 |
|
z9hang
|
b04992b226
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-24 18:07:14 +08:00 |
|
z9hang
|
57cdb55282
|
修正get_level方法是用错误
仿照用户得分规则实现项目个人得分
|
2014-06-24 17:31:39 +08:00 |
|
nwb
|
d1b438953a
|
wiki_format更新
|
2014-06-24 16:26:29 +08:00 |
|
nwb
|
2e38d859fd
|
添加iamgemarick安装包
|
2014-06-24 16:25:43 +08:00 |