Commit Graph

7071 Commits

Author SHA1 Message Date
guange 9b0602fd9c 新增学生作业下载spec 2015-05-18 17:26:50 +08:00
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 5432ac4498 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-18 17:02:19 +08:00
huang df48d89881 版本库权限封装
添加admin可以管理资源的公开私有
2015-05-18 17:02:02 +08:00
yutao 4b58699ee9 修复bug#2270 :forge/course主页--搜索用户无任何作用 2015-05-18 16:41:04 +08:00
alan b4cdd9568e Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-18 14:53:30 +08:00
alan 34893db465 Signed-off-by: alan <547533434@qq.com> 2015-05-18 14:53:01 +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
guange 1226f74750 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-05-16 10:00:37 +08:00
guange d546069051 spec 清理 2015-05-16 09:59:14 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
sw 18bd667726 Merge branch 'szzh' into develop 2015-05-15 17:38:08 +08:00
sw 2a558c924f Merge branch 'guange_dev' into szzh 2015-05-15 17:37:16 +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 659ff254e1 background背景图片拉伸 2015-05-15 17:12:01 +08:00
guange 66e2bc5ef2 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-15 16:19:13 +08:00
sw 69b27ba51f Merge branch 'szzh' into develop 2015-05-15 16:19:01 +08:00
guange 588d96a0c0 头像上传只允许图片 2015-05-15 16:18:44 +08:00
sw df76c7adad Merge branch 'guange_dev' into szzh 2015-05-15 16:18:32 +08:00
sw 10997bf331 Merge branch 'szzh' into develop 2015-05-15 16:15:43 +08:00
sw d6599cd1b0 Merge branch 'guange_dev' into szzh 2015-05-15 16:14:59 +08:00
sw a8e7590b16 Merge branch 'szzh' into guange_dev 2015-05-15 16:13:47 +08:00
sw 81ec174387 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 16:13:02 +08:00
lizanle 056d685982 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-15 16:13:37 +08:00
lizanle e1dd4823d5 课程通知发布api 2015-05-15 16:13:32 +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
lizanle 3b137dadb8 查询未关注需要用户id 2015-05-15 14:04:05 +08:00
lizanle 47d75fe205 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-15 14:02:48 +08:00
lizanle a262f86100 成绩查询我总是在最上方 2015-05-15 14:02:41 +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
guange e5a9d87ce1 新建贴吧如果放个图片就会撑坏版面 2015-05-15 11:18:58 +08:00
guange a1240e8743 将过期改为1个月 2015-05-15 10:27:26 +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