 yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 11:47:57 +08:00 |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
2015-05-15 11:45:15 +08:00 |
 huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 11:28:59 +08:00 |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
2015-05-15 11:26:50 +08:00 |
 lizanle
|
66f8bed978
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-15 10:17:52 +08:00 |
|
lizanle
|
75643b8181
|
修改一个查询user的bug
|
2015-05-15 10:17:47 +08:00 |
 alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-15 10:08:12 +08:00 |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
2015-05-15 10:07:52 +08:00 |
|
huang
|
465dbfe3f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 09:13:16 +08:00 |
|
huang
|
3dc5ee33a6
|
未改动/merge
|
2015-05-15 09:11:59 +08:00 |
|
huang
|
e51d6684ca
|
发布竞赛页面bug
|
2015-05-15 09:09:49 +08:00 |
|
lizanle
|
d2bf8a16de
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-15 09:06:50 +08:00 |
|
lizanle
|
a047bd3d18
|
课程作业发布功能
设置教辅功能
学生列表及成绩查看功能
|
2015-05-15 09:06:36 +08:00 |
 sw
|
c2d11140a1
|
意见反馈问题
|
2015-05-14 17:57:00 +08:00 |
|
sw
|
c573359cd8
|
Merge branch 'szzh' into develop
|
2015-05-14 17:50:43 +08:00 |
|
sw
|
a846ffc051
|
Merge branch 'guange_dev' into szzh
|
2015-05-14 17:48:11 +08:00 |
|
sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
2015-05-14 17:46:08 +08:00 |
 guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
2015-05-14 17:45:02 +08:00 |
|
sw
|
31d80a0026
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 17:40:46 +08:00 |
|
sw
|
c3a98edca8
|
取消打零分时的弹出框
|
2015-05-14 17:40:33 +08:00 |
|
alan
|
e9c1012cbe
|
修改附件上传时公开，删除位置不一致
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 17:23:55 +08:00 |
|
alan
|
b8651606be
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 17:11:43 +08:00 |
|
alan
|
0db90f98d5
|
wiki的attachment与讨论区冲突
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 17:09:38 +08:00 |
|
alan
|
8a8a46a5d2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 17:00:22 +08:00 |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 16:59:43 +08:00 |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
2015-05-14 16:59:27 +08:00 |
|
sw
|
dd7140f4fb
|
意见反馈。内容宽没了
|
2015-05-14 16:57:49 +08:00 |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
2015-05-14 16:53:36 +08:00 |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
2015-05-14 16:48:08 +08:00 |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
2015-05-14 16:26:01 +08:00 |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 16:06:41 +08:00 |
|
sw
|
33365f7ea6
|
修改编辑作业时附件显示移位
|
2015-05-14 16:04:07 +08:00 |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
2015-05-14 16:03:37 +08:00 |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:42:20 +08:00 |
|
huang
|
68986fa1cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 15:38:27 +08:00 |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
2015-05-14 15:37:25 +08:00 |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:19:15 +08:00 |
|
sw
|
8d44ed2189
|
课程--课程通知：取消编辑通知，应该返回通知详情页面，而非一个空白页
|
2015-05-14 15:17:30 +08:00 |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 15:11:36 +08:00 |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:11:20 +08:00 |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
2015-05-14 15:09:15 +08:00 |
|
sw
|
b5719aca8e
|
修改首页我要提问后新建帖子显示样式
|
2015-05-14 14:38:22 +08:00 |
|
guange
|
52217efcb6
|
issue中图片超出边框
|
2015-05-14 14:12:50 +08:00 |
|
guange
|
d88b5dbbed
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-14 12:44:56 +08:00 |
|
guange
|
df8aa72055
|
测试去除spork,有条件可以用zeus
|
2015-05-14 12:44:30 +08:00 |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
2015-05-14 11:41:50 +08:00 |
|
huang
|
97780b7eef
|
私有项目可以引用其他资源
|
2015-05-14 11:14:05 +08:00 |
|
huang
|
84efdb16c9
|
解决wiki500错误
show_new代码优化（代码中存在错误）
|
2015-05-14 11:06:26 +08:00 |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 09:58:08 +08:00 |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
2015-05-14 09:57:13 +08:00 |