 yutao
|
2cc458eafd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-18 17:03:56 +08:00 |
|
yutao
|
9690dc41f6
|
修复bug#2606 :IE浏览器：测试版—中国高校：搜索学校时ajax链接错误
|
2015-05-18 17:03:26 +08:00 |
 huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
2015-05-18 17:02:02 +08:00 |
|
huang
|
3c810a0cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-18 11:37:06 +08:00 |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
2015-05-18 11:36:29 +08:00 |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
2015-05-18 11:16:41 +08:00 |
 sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
2015-05-15 17:36:44 +08:00 |
|
sw
|
0e6c15c160
|
取消个人头像logo删除功能
|
2015-05-15 17:36:18 +08:00 |
 guange
|
d2a7d41963
|
头像加入大小限制
|
2015-05-15 17:35:24 +08:00 |
|
sw
|
b84f6280c2
|
wiki报500
|
2015-05-15 17:29:25 +08:00 |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
2015-05-15 16:13:47 +08:00 |
|
sw
|
06a3ca9fe9
|
IE浏览器中，课程收索为空时显示不正确
|
2015-05-15 16:12:46 +08:00 |
|
sw
|
ea1a98f8ac
|
测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名
|
2015-05-15 16:02:33 +08:00 |
|
sw
|
6566a044d2
|
无工作地点就不显示了
|
2015-05-15 15:38:38 +08:00 |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
2015-05-15 15:17:47 +08:00 |
|
sw
|
404421c745
|
功能贴吧列表，去掉头像的alt属性
|
2015-05-15 15:09:33 +08:00 |
|
guange
|
907d89e1cc
|
merge
|
2015-05-15 13:39:26 +08:00 |
|
yutao
|
a4cf7bcaad
|
修改问题跟踪列表翻页为局部刷新
|
2015-05-15 12:17:47 +08:00 |
|
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 |
 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
|
e51d6684ca
|
发布竞赛页面bug
|
2015-05-15 09:09:49 +08:00 |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
2015-05-14 21:40:34 +08:00 |
|
guange
|
9f3cdba9db
|
merge
|
2015-05-14 17:59:51 +08:00 |
|
guange
|
af2c20f666
|
修复意见反馈不见了的问题
|
2015-05-14 17:58:56 +08:00 |
|
sw
|
c2d11140a1
|
意见反馈问题
|
2015-05-14 17:57:00 +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
|
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 |
|
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 |
|
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 |