 sw
|
bf10e0234b
|
Merge branch 'develop' into szzh
|
2014-11-08 16:35:25 +08:00 |
|
sw
|
606c6a62e4
|
Merge branch 'Homework' into develop
|
2014-11-08 15:32:31 +08:00 |
 z9hang
|
b45e23d837
|
学生匿评份初始值显示修正
|
2014-11-08 15:20:43 +08:00 |
|
sw
|
63d233ee42
|
课程实践-->课程作业
|
2014-11-08 14:06:06 +08:00 |
|
z9hang
|
e297bb2687
|
修改匿评
|
2014-11-08 14:03:02 +08:00 |
|
z9hang
|
f0377ffae7
|
学生匿评修改
|
2014-11-08 13:52:18 +08:00 |
|
sw
|
6157a67e23
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-08 13:44:41 +08:00 |
|
sw
|
e0d85f72a1
|
1.匿评作业列表我的分数显示不正确
2.学生可多次进行匿评评分
|
2014-11-08 13:43:29 +08:00 |
|
z9hang
|
cd1be67b8c
|
学生可多次评分、评分完毕不在提示评分成功
|
2014-11-08 13:43:07 +08:00 |
|
z9hang
|
c68e68af96
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-07 16:38:11 +08:00 |
|
z9hang
|
cc71682e40
|
评分前添加无法修改提示
|
2014-11-07 13:51:18 +08:00 |
|
sw
|
e550f9d91d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-07 11:02:33 +08:00 |
|
sw
|
35cb7273a8
|
课程实践->课程作业
|
2014-11-07 11:02:10 +08:00 |
|
sw
|
ffaa9c51ba
|
修复作业列表报错
修复2个关闭按钮
|
2014-11-07 10:39:17 +08:00 |
|
sw
|
759d69892e
|
修改弹出框样式
|
2014-11-07 10:37:10 +08:00 |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
2014-11-07 10:02:13 +08:00 |
 gonglexin
|
972d748199
|
#1434 解决文件重复上传的问题
|
2014-11-06 19:34:31 +08:00 |
|
sw
|
54aae26cbe
|
被除数为0时弹框报错
|
2014-11-06 17:23:43 +08:00 |
|
z9hang
|
89732c51ef
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homework.html.erb
|
2014-11-06 16:58:05 +08:00 |
|
z9hang
|
9b4e9bd04a
|
1、部分星星显示不正确问题，2、评分初始值设置为0
|
2014-11-06 16:52:29 +08:00 |
|
sw
|
6c13a682c0
|
修改评分为nil报错
|
2014-11-06 16:37:30 +08:00 |
|
sw
|
0a8d0182fd
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 16:08:14 +08:00 |
|
z9hang
|
0d31ec53b5
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 16:06:08 +08:00 |
|
z9hang
|
5034769ab3
|
星星显示不全问题
|
2014-11-06 16:05:47 +08:00 |
|
sw
|
2a8e40603c
|
修改作业弹出框样式
|
2014-11-06 16:05:12 +08:00 |
|
sw
|
f3edbe4b79
|
修改作业连接错误
|
2014-11-06 16:01:07 +08:00 |
 alan
|
fd8a8d1fe2
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-06 15:58:15 +08:00 |
|
sw
|
a19a3b3f43
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 15:50:59 +08:00 |
|
sw
|
b8c9651079
|
111
|
2014-11-06 15:50:39 +08:00 |
|
z9hang
|
3689b5e228
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 15:19:55 +08:00 |
|
z9hang
|
3416b4c047
|
#1435 课程--课程实践：“学生提问”应该有个数字标识学生留言的数量
|
2014-11-06 15:17:36 +08:00 |
|
sw
|
a5202e53a4
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 14:56:52 +08:00 |
|
sw
|
14db93c10a
|
教师作业列表增加当前作业提交信息,匿评信息提示
|
2014-11-06 14:56:14 +08:00 |
|
z9hang
|
373ba9fb33
|
1、用户名过长的显示问题。2、部分内容过长的回复的与头像不在同一行问题
|
2014-11-06 14:51:25 +08:00 |
|
alan
|
0aae731eef
|
修改bug<点击排序后内容类型自动变为全部，但又并未显示全部资源>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-06 14:45:59 +08:00 |
|
sw
|
48aacc70c9
|
调整学生新建、修改作业时的样式
|
2014-11-06 13:53:57 +08:00 |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
2014-11-06 11:58:26 +08:00 |
|
sw
|
8fbbbe82e0
|
修改作业左上角课程、作业名称显示
|
2014-11-06 11:47:28 +08:00 |
|
sw
|
f149dd3a57
|
我的作品应该是缺省显示的tab，等到老师启动匿评后，待评作品才是缺省tab
学生的作业主页中，“所有作品”应该是缺省的tab页
|
2014-11-06 10:58:07 +08:00 |
|
sw
|
7d97889261
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
app/views/layouts/base_homework.html.erb
|
2014-11-06 09:01:01 +08:00 |
|
sw
|
9520007bec
|
学生匿评列表隐藏教师评分
|
2014-11-06 08:44:24 +08:00 |
|
gonglexin
|
c52e87c74f
|
统计数据
|
2014-11-05 21:18:39 +08:00 |
|
sw
|
4267026ec1
|
111
|
2014-11-05 15:20:30 +08:00 |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-05 15:01:36 +08:00 |
|
sw
|
09f89f23a1
|
设置作业总算大于2份是才显示开启匿评按钮
|
2014-11-05 14:51:21 +08:00 |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
2014-11-05 14:46:01 +08:00 |
|
sw
|
15e71ae85b
|
修改左上角作业显示名称和课程显示名称
|
2014-11-05 14:25:21 +08:00 |
|
sw
|
e5874283f1
|
1.修改课程实践列表提交作业按钮链接
2.增加提交作业的控制
3.修改获取在指定课程提交作业的集合的方法判断
|
2014-11-05 14:13:50 +08:00 |
|
sw
|
01350442fb
|
Merge branch 'Homework' into develop
|
2014-11-05 10:55:22 +08:00 |
|
sw
|
cd83ebbe91
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:54:54 +08:00 |