 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 |
|
sw
|
5e91a258fe
|
修改已经提交过作业、再次提交报403
|
2014-11-05 10:54:39 +08:00 |
|
z9hang
|
8998c60746
|
无法评分时不显示评分项
|
2014-11-05 10:53:53 +08:00 |
|
z9hang
|
1d1d2e8b91
|
调整回复样式
|
2014-11-05 10:49:32 +08:00 |
|
sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
2014-11-05 10:49:00 +08:00 |
|
z9hang
|
b462d4e00a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:41:50 +08:00 |
|
z9hang
|
b141db6624
|
用户留言修复
|
2014-11-05 10:41:34 +08:00 |
|
sw
|
4a7fcfaac9
|
增加关闭匿评是的提示
|
2014-11-05 10:39:56 +08:00 |
|
sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:14:24 +08:00 |
|
sw
|
55b7d12908
|
增加判断：匿评分配数量必须大于0
|
2014-11-05 10:14:02 +08:00 |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
2014-11-05 10:06:20 +08:00 |
|
z9hang
|
3b073eec74
|
修正留言样式
|
2014-11-05 10:05:43 +08:00 |
|
z9hang
|
24dc839a39
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 09:52:00 +08:00 |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
2014-11-05 09:51:30 +08:00 |
|
sw
|
eb551788ac
|
1.修复匿评列表查询不正确
2.匿评分配支持2份作业分配
3.匿评分配不正确提示
|
2014-11-05 09:16:06 +08:00 |
|
sw
|
3f2aa9cad1
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/layouts/base_homework.html.erb
|
2014-11-05 08:53:19 +08:00 |
|
gonglexin
|
ed258a98ba
|
作业分配算法优化
|
2014-11-04 21:43:14 +08:00 |
|
gonglexin
|
1c7b6aa17e
|
阻止用户多次点击启动匿评链接
|
2014-11-04 19:51:24 +08:00 |
|
sw
|
cf952b5012
|
Merge branch 'Homework' into develop
|
2014-11-04 18:34:34 +08:00 |
|
sw
|
a08f944d85
|
修复错误
|
2014-11-04 18:33:41 +08:00 |
|
z9hang
|
13c3ac8551
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 18:31:16 +08:00 |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
2014-11-04 18:30:45 +08:00 |
|
sw
|
4d1730f92e
|
修改
|
2014-11-04 17:48:18 +08:00 |
|
alan
|
2ac9456201
|
增加功能<管理员在用户列表中通过用户的“名字”和“邮件地址”来搜索用户>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-04 17:14:18 +08:00 |
|
sw
|
22ada089be
|
Merge branch 'Homework' into develop
|
2014-11-04 17:11:55 +08:00 |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-04 17:06:16 +08:00 |