Commit Graph

7541 Commits

Author SHA1 Message Date
huang 08123c2d62 缺陷回帖缩进 2015-07-03 16:11:11 +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
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
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
sw b0b2fe7148 Merge branch 'Poll' into szzh 2015-07-03 10:55:41 +08:00
sw d2b76e92f2 展开后成绩得分框显示位置 2015-07-03 10:55:22 +08:00
huang e986ee4e4e Merge branch 'szzh' into dev_hjq
Conflicts:
	app/views/issues/_edit.html.erb
2015-07-03 10:51:54 +08:00
sw 642fa8dd5d 1、缺评、迟交扣分
2、匿评提示框、最终成绩计算提示框
3、修改作业
2015-07-03 10:47:10 +08:00
huang b16e19096f 添加新闻回复 2015-07-03 10:25:21 +08:00
sw 1e12b68027 下载附件提示遮住按钮 2015-07-03 10:09:49 +08:00
lizanle 662fc02a80 news author解析 2015-07-03 09:44:26 +08:00
sw 194ab98361 我的评分显示错误 2015-07-02 17:44:58 +08:00
sw e82c88df48 当最终评分未评时,成绩显示未评分 2015-07-02 17:44:25 +08:00
lizanle 426d382ee5 学生作业模型 2015-07-02 17:32:36 +08:00
lizanle 2fe18787a2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-02 17:31:46 +08:00
lizanle 9eab8b92ca 动态 api 隐藏 资源 讨论区 2015-07-02 17:31:30 +08:00
huang f3e71450ee 修改issue列表在IE浏览器下显示异常 2015-07-02 17:20:09 +08:00
sw 0d0e294c10 迟交扣分记录 2015-07-02 16:40:12 +08:00
huang def0e892af 解决公共贴吧发布内容过长500错误 2015-07-02 16:38:28 +08:00
sw 08c9d5a498 迟交扣分记录 2015-07-02 16:16:29 +08:00
sw acc3f6dadf 新建作业显示迟交扣分、缺评扣分 2015-07-02 16:04:26 +08:00
huang a3070e06e8 修改成上传空文件不给出提示 2015-07-02 16:03:06 +08:00
sw f9475dea62 Merge branch 'Poll' into szzh 2015-07-02 15:57:44 +08:00
sw e55d307d33 Merge branch 'szzh' into Poll 2015-07-02 15:57:11 +08:00
huang 5a950b227a 课程、项目上传文件为空时给出提醒 2015-07-02 15:53:12 +08:00
sw 140c836ec0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-02 15:36:46 +08:00
sw 976c4ddd19 增加迁移文件 2015-07-02 15:36:27 +08:00
zhangshenjerry 54317af6d8 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-02 15:31:34 +08:00
sw a6e80ed938 部分用户右上角下拉框不显示我的课程 2015-07-02 15:30:30 +08:00
zhangshenjerry 448cedc842 回复的收缩 2015-07-02 15:30:09 +08:00
zhangshenjerry 05eeb27de8 回复的收缩 2015-07-02 15:28:23 +08:00
huang 081a0cedf7 去掉项目搜索列表中导出atom 2015-07-02 15:16:07 +08:00
huang c0b3e27c1b 添加项目文件上传成功提醒 2015-07-02 15:02:05 +08:00
huang ea13912852 解决issue描述查看差别点击时间后异常 2015-07-02 14:56:44 +08:00