Commit Graph

2425 Commits

Author SHA1 Message Date
sw 392dc0c365 增加访问作业显示列表的权限 2014-06-26 14:58:59 +08:00
sw dbd5c49246 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 14:48:31 +08:00
nwb a115edea9d 修改课程标签页选中状态 2014-06-26 14:47:29 +08:00
sw 91180f922a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 14:45:44 +08:00
sw ed9b97f987 增加访问作业显示列表的权限 2014-06-26 14:42:32 +08:00
nwb 9ae5f59a29 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 11:43:13 +08:00
nwb f8e5c2358a 学生角色添加回复讨论区权限 2014-06-26 11:43:03 +08:00
sw 56ce9e8bdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 11:41:10 +08:00
sw c4b2c47dc7 调整作业显示样式 2014-06-26 11:40:54 +08:00
sw 12087f40c7 1.当作业未选定项目时,项目得分为灰色的N/A,选定了项目,项目得分为橘色的分数
2.当无人对作业进行互评、综评时,作业的互评、综评得分为灰色的N/A,有人进行评分则为橘色的分数
3.简化代码
2014-06-26 11:22:48 +08:00
nwb b4af75f289 部分界面优化 2014-06-26 11:15:06 +08:00
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题 2014-06-26 10:55:50 +08:00
nwb f4aa817f42 修改合并后首页出错的问题 2014-06-26 10:01:44 +08:00
nwb 88c3347f7c 修正合并分支后的创建课程错误 2014-06-26 09:15:56 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
2014-06-26 08:53:16 +08:00
nwb c5a837c689 修改资源文件测试用例 2014-06-25 16:26:19 +08:00
nwb ff67e3dbfe 更新测试环境搭建文档 2014-06-25 10:40:59 +08:00
nwb 25e30ec604 修改文档 2014-06-25 10:15:30 +08:00
nwb 241b1f2dc6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-25 09:44:51 +08:00
nwb 1e1ff110fc 添加测试说明文档 2014-06-25 09:44:35 +08:00
z9hang b04992b226 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-24 18:07:14 +08:00
z9hang 57cdb55282 修正get_level方法是用错误
仿照用户得分规则实现项目个人得分
2014-06-24 17:31:39 +08:00
nwb d1b438953a wiki_format更新 2014-06-24 16:26:29 +08:00
nwb 2e38d859fd 添加iamgemarick安装包 2014-06-24 16:25:43 +08:00
nwb d5665c7bb7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-24 15:42:39 +08:00
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
2014-06-24 15:42:28 +08:00
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数 2014-06-24 13:57:51 +08:00
nwb 6a2c486f62 修改作业数为10倍数时的显示BUG 2014-06-24 09:58:05 +08:00
nwb 9e0ae72ab7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-24 09:55:48 +08:00
nwb 91f0b58a7a gem修改 2014-06-24 09:55:41 +08:00
sw c320ede205 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-24 09:24:29 +08:00
linchun ead7fca3f8 fix gemfie 2014-06-23 19:11:58 +08:00
z9hang dc1bd010f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 17:59:10 +08:00
nwb e367c03f6e 修正课程作业列表显示BUG 2014-06-23 17:50:45 +08:00
z9hang df89e5e173 去掉多的一个分数显示 2014-06-23 17:49:20 +08:00
nwb 26b92a925f 去掉测试gem 2014-06-23 17:35:12 +08:00
nwb 4536680acc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 17:33:45 +08:00
linchun 7ba723e582 bundle mysql connetion version 2014-06-23 17:16:12 +08:00
nwb 067a2d7841 修改文件未找到界面 2014-06-23 16:13:00 +08:00
nwb ef61e41d48 去掉首页缓存 2014-06-23 16:00:10 +08:00
nwb d233f9fe94 更新文档 2014-06-23 15:00:54 +08:00
sw 91408cc960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 14:59:41 +08:00
nwb d0843861ce Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 14:52:48 +08:00
nwb f33dc6bff6 1.修改测试环境搭建文档
2.添加部分测试用例
2014-06-23 14:51:57 +08:00
sw 358d4a53b8 修复未公开项目动态仍在主页最新动态显示的问题 2014-06-23 14:19:01 +08:00
z9hang 773b728828 修改:自己不能踩或顶自己 2014-06-23 11:17:42 +08:00
sw 0dce86d47e 修改首页项目显示为按活跃度排名的前10个项目 2014-06-23 09:42:08 +08:00
z9hang f16bec924c 处理undefined method `update_user_level' for nil:NilClass问题 2014-06-23 09:27:21 +08:00
z9hang 9d9bc76af4 定时刷新分数 2014-06-21 17:06:08 +08:00
z9hang bf91222e76 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-21 16:53:36 +08:00