Commit Graph

1534 Commits

Author SHA1 Message Date
alan 6192a36481 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-26 15:51:53 +08:00
alan b79b08fa8f 编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
2014-12-26 15:51:39 +08:00
z9hang 68cadba317 #1710 测试版--项目--作品下载:选择任意内容类型、文件类型,都弹出error的提示框 2014-12-26 15:35:38 +08:00
alan d2aef552e6 优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
2014-12-26 14:50:14 +08:00
alan f8dc9dcd35 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
	app/controllers/courses_controller.rb
2014-12-25 10:31:11 +08:00
alan b17d4840b1 《作业优化》
Signed-off-by: alan <547533434@qq.com>
2014-12-25 10:23:59 +08:00
sw 9545b1da0c 优化课程成员列表访问效率 2014-12-25 09:02:58 +08:00
alan 0e7f7a4254 优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
2014-12-24 18:31:45 +08:00
alan 8e87e83ad8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-24 15:55:16 +08:00
alan abdd6458d3 优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
2014-12-24 15:55:08 +08:00
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/users_controller.rb
2014-12-24 09:45:23 +08:00
sw b512bc53e9 修改用户搜索无法精确搜索的bUG 2014-12-24 09:08:42 +08:00
alan b8e00e16df Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-22 17:02:49 +08:00
alan 629641d065 《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
2014-12-22 17:02:32 +08:00
z9han 67ffc03fee #1708 课程--资源库:非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用 2014-12-22 16:16:33 +08:00
sw 73afb7e6c8 调用作业课程时首先判断该作业的所属课程是否存在 2014-12-22 14:15:49 +08:00
alan c99af4cb7b 修改《个人主页出现没权限访问链接》bug
Signed-off-by: alan <547533434@qq.com>
2014-12-22 11:26:21 +08:00
alan 683acfcafc 优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-22 10:31:09 +08:00
alan d81240e63c 修改《关注老师后,老师发布的作业都会在我主页的动态中显示出来,若我未加入该课程但感兴趣点击后返回403页面,提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
2014-12-22 01:29:53 +08:00
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-19 23:12:32 +08:00
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
2014-12-19 10:51:53 +08:00
alan c560ca617b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-18 18:25:02 +08:00
alan 1965b75d92 添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-18 18:24:37 +08:00
sw b6327460a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-18 15:49:49 +08:00
alan 8e592bae98 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-17 17:36:29 +08:00
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
2014-12-17 17:36:12 +08:00
sw 5966a1edb6 修改老师开启匿评时的提示信息 2014-12-15 16:20:58 +08:00
sw cf2810f1c6 #1712点击打开某竞赛作品,网页名显示为托管项目的名称 2014-12-15 15:13:11 +08:00
sw 9ffe32e121 修改老师第一次可以不对学生作业进行评分,只进行评价 2014-12-15 09:10:21 +08:00
z9hang c0a0c41e14 私有课程的公开资源能下载bug 2014-12-12 16:53:49 +08:00
sw 363e681254 修复课程获取出错的BUG 2014-12-12 16:52:44 +08:00
sw 595f6805f9 修改删除附件是方法 2014-12-12 16:28:37 +08:00
sw b7b1a81a54 修改下载附件传入参数有误 2014-12-12 09:46:12 +08:00
sw f46240a5eb 修复学号为空下载附件报错的BUG 2014-12-12 09:32:09 +08:00
sw c067d3e4c5 修改保存评分时报错 2014-12-11 16:09:33 +08:00
sw d3e7f484ca #1684 某课程主页--不输入搜索条件,直接点击搜索按钮返回404页面 2014-12-11 15:37:48 +08:00
sw e768abbf31 修复有时留言回复失败的BUG 2014-12-11 09:24:22 +08:00
sw cf5b03a379 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/courses/_member_list.html.erb
2014-12-10 17:56:50 +08:00
sw 9957cfd401 修复学生无学号时打包下载其上传作业附件报错的问题 2014-12-10 17:04:22 +08:00
sw 8a2d22265c 修复访问不存在的项目时报500的问题 2014-12-10 16:26:39 +08:00
sw 0044f17fba #1688修改竞赛搜索报404 2014-12-10 09:37:24 +08:00
alan 90a01c8d84 对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
2014-12-09 15:16:43 +08:00
alan d8a568e685 增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-09 14:57:10 +08:00
alan 5c33c578bb 增减功能《课程分班模块添加当分班中没有学生时,可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
2014-12-08 16:50:20 +08:00
sw 060b856b23 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/courses/_member_list.html.erb
2014-12-06 13:46:42 +08:00
alan 19936fa05f 修改《角色发生变化时分班人数不对》bug
Signed-off-by: alan <547533434@qq.com>
2014-12-06 13:32:47 +08:00
alan 03a8d8ccc9 修改《教师列表中不应该有搜索功能》
Signed-off-by: alan <547533434@qq.com>
2014-12-06 12:34:02 +08:00
sw b51cd1aabb 取消教师列表的搜索功能 2014-12-06 11:00:15 +08:00
alan 63a9fcd483 修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
2014-12-05 16:44:05 +08:00
alan c5a7baa454 修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
2014-12-05 16:21:53 +08:00