 z9hang
|
1fe87d5fef
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-12 11:40:07 +08:00 |
 guange
|
828f57249c
|
merger
|
2015-01-10 21:32:23 +08:00 |
|
guange
|
da880dae00
|
作业展示
|
2015-01-10 21:31:16 +08:00 |
 sw
|
90349eed5d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-01-10 18:31:06 +08:00 |
|
sw
|
6fc496c8ee
|
Merge branch 'szzh' into develop
|
2015-01-10 18:22:54 +08:00 |
 huang
|
2cd805ef4c
|
去掉课程单独的弹框
|
2015-01-10 18:17:36 +08:00 |
 alan
|
f0d75f5685
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2015-01-10 18:04: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 |
|
sw
|
bf7eaa7a80
|
修复同一个学生提交相同的文件后，打包下载异常的BUG
|
2015-01-10 17:41:50 +08:00 |
|
alan
|
d65239ef48
|
<merge code from dev_dingxu>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 17:27:42 +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 |
|
alan
|
090f2bf07a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-10 16:31:16 +08:00 |
|
alan
|
a0d6bf4603
|
gemfile恢复
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 16:30:56 +08:00 |
|
sw
|
57eb9f555f
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-01-10 16:21:56 +08:00 |
|
sw
|
41679a8d5c
|
修改文件缺少时的提示
|
2015-01-10 16:20:36 +08:00 |
|
sw
|
477f480175
|
增加EXCEL相关的gem
|
2015-01-10 16:06:33 +08:00 |
|
sw
|
f101037b26
|
Merge branch 'szzh' into develop
|
2015-01-10 15:59:56 +08:00 |
|
z9hang
|
320c01994b
|
去除部分gem
|
2015-01-10 15:50:52 +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 |
|
z9hang
|
666facd483
|
Merge branch 'szzh' into develop
|
2015-01-10 14:40:45 +08:00 |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:46:39 +08:00 |
|
alan
|
2b3aad2474
|
resolve conflict
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:05:24 +08:00 |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:01:16 +08:00 |
|
sw
|
f4e30f77cc
|
1.打包下载异常捕获去除
2.打包下载寻找课程、项目方法隐藏
|
2015-01-10 10:55:37 +08:00 |
|
alan
|
ada4ac0877
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-10 10:37:47 +08:00 |
|
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 10:37:32 +08:00 |
 zhuhao
|
9f1f7d8187
|
调整上传资源的按钮样式
|
2015-01-10 10:03:09 +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
|
a30cc9bea8
|
修改文件缺少时的提示
|
2015-01-09 16:01:47 +08:00 |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
2015-01-09 15:59:42 +08:00 |
|
sw
|
82c2a659df
|
修复当作业打包下载时，某一文件不存在时，跳过该文件继续下载其他的文件
|
2015-01-09 15:33:30 +08:00 |
|
alan
|
3f354a019f
|
修改（个人主页个人签名格式乱了）
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 14:14:15 +08:00 |
|
alan
|
b88255acfc
|
delete no use file
|
2015-01-09 12:34:52 +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
|
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 |