 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 |
|
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 |
|
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
|
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 |