 sw
|
d6ce290a8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
db/schema.rb
|
2015-01-12 15:03:10 +08:00 |
 alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
2015-01-12 14:58:11 +08:00 |
 huang
|
2cd805ef4c
|
去掉课程单独的弹框
|
2015-01-10 18:17:36 +08:00 |
|
alan
|
296d88c14d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-10 18:02:03 +08:00 |
|
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 18:01:41 +08:00 |
|
alan
|
a31088cc1b
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 17:27:08 +08:00 |
|
alan
|
3db80fc3fc
|
修改《contest链接bug》
|
2015-01-10 17:02:23 +08:00 |
|
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-10 15:42:33 +08:00 |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
2015-01-10 15:39:02 +08:00 |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:46:39 +08:00 |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:01:16 +08:00 |
|
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 10:37:32 +08:00 |
|
alan
|
725866a23d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-09 17:04:32 +08:00 |
|
alan
|
c9e23ec52f
|
修改《创建作业页面》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 17:03:58 +08:00 |
 zhuhao
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
2015-01-09 16:05:38 +08:00 |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
2015-01-09 15:59:42 +08:00 |
|
sw
|
82c2a659df
|
修复当作业打包下载时，某一文件不存在时，跳过该文件继续下载其他的文件
|
2015-01-09 15:33:30 +08:00 |
|
sw
|
7de8e610e8
|
1.增加问卷调查部分action的demo
2.问卷表增加描述字段
3.修改作业时网页标题错误
|
2015-01-09 14:27:50 +08:00 |
|
alan
|
3f354a019f
|
修改（个人主页个人签名格式乱了）
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 14:14:15 +08:00 |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 12:29:49 +08:00 |
|
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
|
8d10875d61
|
取消部分无用的control、增加各action方法体以及对应的路由
|
2015-01-09 08:58:25 +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 |
|
sw
|
2277d388c0
|
修改了两处语法错误
|
2015-01-07 09:37:35 +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 |
|
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
|
77e8d412ea
|
修改评分列表中教师评分未最后一名教师的评分
|
2014-12-31 11:18:22 +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 |