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

4832 Commits

Author SHA1 Message Date
alan 4b9bad0dc5 修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 10:57:33 +08:00
alan d095aed7a3 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-09 10:22:49 +08:00
alan 2dc626b595 修改《学生列表中重名的班名提示报错》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 10:22:30 +08:00
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-08 17:44:17 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构 
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
 2015-01-08 17:42:46 +08:00
zhuhao a2c2266590 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-08 17:05:27 +08:00
zhuhao aae69417cd 标签按钮样式修改 2015-01-08 17:05:08 +08:00
alan 9bbc8d64eb 课程母版页加载缓慢 
Signed-off-by: alan <547533434@qq.com>
 2015-01-08 17:04:25 +08:00
alan 2262997c31 修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》 
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
    《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
   《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
   《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
 2015-01-08 16:16:59 +08:00
sw 4c6ade4c08 定义各model之间的关系 2015-01-08 14:41:28 +08:00
sw c9de30bd83 增加问卷调查相关表，以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
alanlong9278 da85c3efb8 进入某竞赛主页，点击创新竞赛链接没反应 2015-01-07 17:48:22 +08:00
alanlong9278 d212a20bbf IE浏览器中：课程，竞赛，托管平台的主页不能正常显示 2015-01-07 17:28:45 +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
sw 035d45ea5c 增加数据库访问配置文件 2015-01-07 10:12:03 +08:00
lizanle 7d351e9794 change cache files sites 2015-01-07 09:53:52 +08:00
sw 2277d388c0 修改了两处语法错误 2015-01-07 09:37:35 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
sw a09a3dc378 课程首页： 1-3月份显示上一年度的秋季学期的课程， 3-9月份显示本年度的春季学期课程， 9-12月份显示本年度的秋季学期的课程 2015-01-04 15:06:26 +08:00
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
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
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