Commit Graph

4954 Commits

Author SHA1 Message Date
z9hang fdb38c1b87 修复课程教师,课程学生接口 2015-01-07 15:24:43 +08:00
alanlong9278 7443cadf61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-07 15:04:17 +08:00
alanlong9278 9e2bff7778 托管平台中创建某项目后进入该项目主页,点击tab的配置---信息,form表单没对齐 2015-01-07 14:59:41 +08:00
zhuhao 45bf8c17d4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-07 14:51:10 +08:00
zhuhao 8b6902f860 修改“添加标签”按钮压线,样式调整 2015-01-07 14:50:55 +08:00
z9hang 303752fc7e 修复退出课程接口 2015-01-07 11:37:48 +08:00
z9hang b711793d7c 修正加入课程接口问题 2015-01-07 11:20:27 +08:00
sw 035d45ea5c 增加数据库访问配置文件 2015-01-07 10:12:03 +08:00
sw 2277d388c0 修改了两处语法错误 2015-01-07 09:37:35 +08:00
z9hang d407f8656d 1、修复课程img_url为空问题。2、补上用户课程接口 2015-01-06 17:46:16 +08:00
z9hang 1686ed4fbd 补上显示用户接口 2015-01-06 16:59:22 +08:00
z9hang ed776fa9b9 1、修正用户编辑接口报错问题。2、修正用户注册,编辑用户接口返回数据不正确问题 2015-01-06 16:51:44 +08:00
z9hang 2c49dad4dc Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-06 15:49:24 +08:00
guange 59f687bb6a added homework 2015-01-05 19:53:25 +08:00
z9hang 58c31b1d7f Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-05 17:47:14 +08:00
z9hang f252438f85 修改编辑课程接口 2015-01-05 17:47:04 +08:00
guange b1125e7d7e 编辑课程改为put 2015-01-05 17:45:47 +08:00
guange a3ed599d49 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-05 17:45:14 +08:00
z9hang f55d8fe303 1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题 2015-01-05 16:58:11 +08:00
z9hang b5da95d5ce 修改错误 2015-01-05 10:15:14 +08:00
sw a09a3dc378 课程首页: 1-3月份显示上一年度的秋季学期的课程, 3-9月份显示本年度的春季学期课程, 9-12月份显示本年度的秋季学期的课程 2015-01-04 15:06:26 +08:00
guange d97b26f131 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-04 14:55:53 +08:00
guange d7cad23854 加上作业 2015-01-04 14:55:45 +08:00
sw 805de7fc28 修改课程首页课程列表显示策略 2015-01-04 13:28:33 +08:00
hhuai d1846e6303 for update 2015-01-04 11:53:16 +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
sw c329d9f29e Merge branch 'szzh' into develop 2014-12-31 19:27:39 +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