Commit Graph

7590 Commits

Author SHA1 Message Date
sw 1ea972d030 Merge branch 'szzh' into sw_new_course 2015-07-06 11:13:26 +08:00
sw 1a1580953a 分班后学生显示不全 2015-07-06 11:12:29 +08:00
sw e734abe613 修改作业逻辑梳理 2015-07-06 10:44:27 +08:00
sw 5e90684677 Merge branch 'szzh' into sw_new_course
Conflicts:
	app/controllers/homework_common_controller.rb
2015-07-06 10:44:07 +08:00
sw 87ef7383cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-04 16:00:59 +08:00
sw 2137cef984 匿评作品。老师评分之后,页面显示有问题 2015-07-04 15:54:03 +08:00
huang 602670b841 邮件按天通知:修改贴吧动态和个人动态颜色 2015-07-04 15:42:03 +08:00
sw 4b2f2680fd 1、为开启匿评作业,附件下载提示框显示位置不正确
2、导出列表成绩是最终评分而不是最终成绩
2015-07-04 15:26:32 +08:00
huang 4f5b4c65d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-04 15:26:20 +08:00
huang be2b3a78d6 修改项目资源引用未选着项目时提示 2015-07-04 15:26:01 +08:00
sw e46ccda8e6 1111 2015-07-04 15:09:08 +08:00
sw 1b4e2b2953 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-04 15:07:00 +08:00
sw d237d37952 Merge branch 'develop' into szzh 2015-07-04 15:06:36 +08:00
sw a6b6432320 修改扣分标准描述 2015-07-04 15:06:21 +08:00
huang 3e88d62ba6 修改课程附件问题 2015-07-04 14:57:17 +08:00
sw e22d2793c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-04 14:26:26 +08:00
huang 6f0cb975fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-04 12:13:05 +08:00
huang 02805fd145 1、修改邮件显示样式及国际化
2、发布作业代码更新
2015-07-04 12:12:44 +08:00
sw 283e93c9e2 为启用匿评作业不现实匿评栏 2015-07-04 12:07:21 +08:00
sw 3906cbbf75 匿评作业和非匿评作业,作品列表显示区分 2015-07-04 11:42:44 +08:00
sw 5694b99bf1 扣分标准提示显示 2015-07-04 11:37:43 +08:00
sw 35a0f07d9f 未开启匿评作业不显示导出缺评。匿评 2015-07-04 11:07:21 +08:00
lizanle 0f9642e60b Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-04 09:35:16 +08:00
lizanle e85f63831c 作业 状态文字 2015-07-04 09:35:04 +08:00
sw 780ec509d2 Merge branch 'develop' into szzh 2015-07-03 17:30:39 +08:00
sw 9ee9b0277c 缺评列表导出问题 2015-07-03 17:30:08 +08:00
huang 08123c2d62 缺陷回帖缩进 2015-07-03 16:11:11 +08:00
sw a90ebbef96 Merge branch 'szzh' into develop 2015-07-03 16:10:26 +08:00
sw e44cecaa23 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-03 16:09:21 +08:00
huang a2da6fb55b Merge branch 'dev_hjq' into szzh 2015-07-03 16:05:44 +08:00
huang 162fcc7ff4 Merge branch 'szzh' into dev_hjq 2015-07-03 16:04:55 +08:00
huang 0430a0e810 修改journals查询错误 2015-07-03 16:03:21 +08:00
huang 750070bdc7 configuration冲突处理 2015-07-03 15:51:54 +08:00
huang 6da8cf237d 邮件按天发送,内容按课程划分 2015-07-03 15:49:03 +08:00
sw 3cfb77e98e 1、最终成绩提示框保留2位数字
2、修改迟交扣分时,迟交作品计算有问题
2015-07-03 15:43:17 +08:00
huang b5badbd25f 项目中邮件通知按项目排序 2015-07-03 15:33:22 +08:00
lizanle a894326227 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-03 15:33:04 +08:00
lizanle 5c648c9284 Attachment添加file_dir 属性 2015-07-03 15:32:57 +08:00
huang f8a35d2f97 邮件:缺陷按项目排序 2015-07-03 15:22:24 +08:00
yutao d882a3c5ee bug#2948:在课程和个人主页模块,被留言的人应该能看到留言人的昵称和真实姓名 2015-07-03 15:20:53 +08:00
sw 2fa58de302 问卷结果界面显示 2015-07-03 15:05:46 +08:00
yutao 0a0f5d98db 课程动态 加入 与我相关 2015-07-03 15:03:53 +08:00
huang 17280e78ab 引用模式的修改 2015-07-03 15:00:15 +08:00
lizanle d3d656f3b8 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-03 12:22:41 +08:00
lizanle fe55258349 获取匿评状态的解释 api
开启匿评 api
2015-07-03 12:22:33 +08:00
sw 981ad6e743 缺评列表显示 2015-07-03 11:49:02 +08:00
sw 73d7ae4988 修改作品时匿评扣分提示不正确 2015-07-03 11:44:11 +08:00
sw 2938679795 迟交和缺评扣分,修改为0后继续修改有问题 2015-07-03 11:41:53 +08:00
sw 4eb9ce6f0f css报错 2015-07-03 10:58:30 +08:00
sw 467da8f01d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-03 10:55:53 +08:00