jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,506 Commits 98 Branches 0 Tags 0 B
Commit Graph

4506 Commits

Author SHA1 Message Date
sw 805de7fc28 修改课程首页课程列表显示策略 2015-01-04 13:28:33 +08:00
alan 394beedcc2 <课程首页>bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-01 09:56:18 +08:00
alan 43511c8e97 修改《课程首页按年份显示》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-01 09:38:21 +08:00
alan c1705bd65b 增加《导入student_for_course数据》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 17:02:55 +08:00
sw fc7447ba6b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 16:01:18 +08:00
sw 9fc7ed8233 修复老师第一次评分报错问题的BUG 2014-12-31 16:00:45 +08:00
z9hang 7741e7bd37 非当前老师提交的资源显示引入我的其他课程 2014-12-31 15:58:21 +08:00
alan 275d691b13 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/controllers/homework_attach_controller.rb
	app/views/courses/_member_list.html.erb

Signed-off-by: alan <547533434@qq.com>
 2014-12-31 15:50:19 +08:00
alan ba524675e0 修改<打分更新表单>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 15:48:45 +08:00
sw 16201f79cf 去掉首页更新提示 2014-12-31 15:47:43 +08:00
sw 06d4d2f465 修复老师列表加入时间和实际时间未对齐 2014-12-31 14:41:33 +08:00
sw 833155e4e8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 11:18:43 +08:00
sw 77e8d412ea 修改评分列表中教师评分未最后一名教师的评分 2014-12-31 11:18:22 +08:00
z9hang ad156079c6 修改加错的gem包 2014-12-31 11:03:26 +08:00
z9hang 2171198ba1 恢复被删除的gem包 2014-12-31 10:59:33 +08:00
sw 3dc7c55aef 去除评分时部分重复查询 2014-12-31 10:45:21 +08:00
alan 7a727bfed7 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-31 10:23:36 +08:00
alan 486f0b69b1 数据迁移student_for_course的数据 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 10:23:21 +08:00
sw 171d743fa1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 10:10:31 +08:00
sw b79ec2b50f #1761 修复关闭匿评不可用 2014-12-31 10:09:00 +08:00
z9hang 4b923ed483 修改导出作品列表的名称 2014-12-31 09:48:17 +08:00
z9hang 42b3fd9584 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 09:05:30 +08:00
z9hang d3f9f23465 修改课程列表导出的文件名 2014-12-31 09:05:21 +08:00
alan 23140307aa 实现<去存储过程功能，并修改打分的表更新> 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 08:48:14 +08:00
z9hang 35dce16924 课程成员列表excel导出 2014-12-30 17:49:48 +08:00
sw a07bb18dcb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-30 15:39:23 +08:00
sw d08bce46dd 调整页面代码 2014-12-30 14:52:44 +08:00
= 098b8094b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-30 14:35:57 +08:00
= 305cbae008 维护浮动框 2014-12-30 14:35:35 +08:00
alan 5c49c9fd4f Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-30 14:34:12 +08:00
alan ed54248494 修改《查找学生信息》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 14:33:46 +08:00
z9hang 101be35f19 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-30 14:29:41 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
sw 66d67e2cc9 修改通知界面主题最多为60个字符 2014-12-30 14:14:20 +08:00
alan 6a86e1c386 <分组点击两次>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 14:00:48 +08:00
sw 933a84f51d 项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索 2014-12-30 11:09:47 +08:00
sw ee1df78f13 课程、项目首页增加用户姓名、邮箱、昵称等搜索功能 2014-12-30 10:57:39 +08:00
sw 0bce2ae8f3 #1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同 2014-12-30 09:48:30 +08:00
alan 4f5fe52485 基于苏稳添加的字段优化存储过程 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 09:21:56 +08:00
alan 5874450d14 修改《学生列表排序用的存储过程》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 22:20:21 +08:00
alan 36eca5e425 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-29 20:46:41 +08:00
alan e39e801c61 增加《学生列表按作业评分排序功能》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 20:46:27 +08:00
z9hang 058d19f8d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-29 17:45:05 +08:00
z9hang 61e1f0fa52 导出作品列表功能 2014-12-29 17:44:39 +08:00
sw 3545a8b0bc 修改竞赛评分显示异常 2014-12-29 17:34:07 +08:00
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-29 17:00:35 +08:00
sw 70083789cb 1.修复匿评列表查询有错 
2.修复当身份改变时修改分数初始分数为之前身份的评分，修改为修改之前身份的评分的BUG
3.是否已经评分判断增加在当前角色下是否已经评分
 2014-12-29 16:59:22 +08:00
alan 9ba0c75ddb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-29 16:57:47 +08:00
alan fb398904b6 优化《学生列表》分页查询 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 16:57:31 +08:00
z9hang cd6508efa2 提交部分代码 2014-12-29 16:30:39 +08:00