 cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
2015-09-06 15:31:26 +08:00 |
 lizanle
|
baf3d90836
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 15:19:11 +08:00 |
|
lizanle
|
704337fe56
|
全选所有资源，然后再用关键字过滤，全选checkbox和选择资源的个数应该清空
|
2015-09-06 15:16:32 +08:00 |
 sw
|
c71bfe73fb
|
Merge branch 'szzh' into develop
|
2015-09-06 15:02:16 +08:00 |
|
sw
|
f3e4812d00
|
修改计算项目得分方法名
|
2015-09-06 15:01:59 +08:00 |
|
sw
|
fd976b4524
|
Merge branch 'develop' into szzh
|
2015-09-06 14:30:10 +08:00 |
|
sw
|
78cfed2b68
|
缺陷列表过滤修改
|
2015-09-06 14:29:04 +08:00 |
|
sw
|
d3236aaa0c
|
Merge branch 'szzh' into develop
|
2015-09-06 12:10:24 +08:00 |
|
sw
|
56a96acbf0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-09-06 12:10:11 +08:00 |
|
sw
|
80f87bb36e
|
Merge branch 'develop' into szzh
|
2015-09-06 12:09:48 +08:00 |
|
sw
|
6607e72ca4
|
user_score_helper.rb还原
|
2015-09-06 12:08:24 +08:00 |
 huang
|
bb15f00637
|
Merge branch 'develop' into dev_hjq
|
2015-09-06 11:56:40 +08:00 |
|
huang
|
a30ee2cb10
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-09-06 11:55:59 +08:00 |
|
huang
|
87387273d8
|
解决消息链接点击一次多一条的问题
|
2015-09-06 11:55:20 +08:00 |
|
sw
|
c4320f1bcc
|
Merge branch 'szzh' into develop
|
2015-09-06 11:25:02 +08:00 |
|
sw
|
96a2beb342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 11:23:54 +08:00 |
|
sw
|
a1fba34858
|
Merge branch 'develop' into szzh
Conflicts:
app/helpers/user_score_helper.rb
|
2015-09-06 11:23:38 +08:00 |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
|
cxt
|
d274b675db
|
去掉动态中的“缺陷描述”、“通知描述”等文字
|
2015-09-06 10:07:18 +08:00 |
|
sw
|
cc9c84b333
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 09:31:33 +08:00 |
|
sw
|
1bda18afff
|
111
|
2015-09-06 09:31:09 +08:00 |
|
lizanle
|
9caa7a421a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 09:05:37 +08:00 |
|
lizanle
|
f8c85ccb83
|
个人动态页面 回复框固定高度减少
|
2015-09-06 09:05:24 +08:00 |
|
huang
|
4ce8282bd2
|
修改项目500问题
|
2015-09-03 19:19:46 +08:00 |
|
huang
|
6f64355a4a
|
Merge branch 'szzh' into develop
|
2015-09-03 17:22:58 +08:00 |
|
huang
|
f5b4b02fb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 17:19:04 +08:00 |
|
huang
|
dd06aa3a92
|
添加为空判断
|
2015-09-03 17:15:38 +08:00 |
 guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 16:59:24 +08:00 |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
2015-09-03 16:58:38 +08:00 |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
2015-09-03 16:28:49 +08:00 |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
2015-09-03 16:09:40 +08:00 |
|
huang
|
02ace5693f
|
去掉项目多余的横线
|
2015-09-03 16:02:58 +08:00 |
|
guange
|
8ac8edeb71
|
Merge branch 'guange_homework' into szzh
|
2015-09-03 12:38:47 +08:00 |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
2015-09-02 22:09:23 +08:00 |
|
huang
|
719cbee3ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:48:27 +08:00 |
|
sw
|
1e13c4f6f2
|
Merge branch 'develop' into szzh
|
2015-09-02 21:48:26 +08:00 |
|
huang
|
a78b28f1b7
|
0条消息则不显示“全部设为已读”
|
2015-09-02 21:47:42 +08:00 |
|
guange
|
f6edbb238e
|
隐去编程作业的得分
|
2015-09-02 21:47:07 +08:00 |
|
guange
|
d07873cdf0
|
时间格式修改
|
2015-09-02 21:44:08 +08:00 |
|
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
|
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +08:00 |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
2015-09-02 21:33:03 +08:00 |
|
sw
|
415d52576a
|
Merge branch 'szzh' into develop
|
2015-09-02 21:31:37 +08:00 |
|
sw
|
359e34471b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:30:59 +08:00 |
|
sw
|
0e475d2a27
|
Merge branch 'develop' into szzh
|
2015-09-02 21:30:47 +08:00 |
|
sw
|
7424c82eae
|
留言框高度
|
2015-09-02 21:30:31 +08:00 |
|
sw
|
ee60905eda
|
回复之后回复框消失
|
2015-09-02 21:00:08 +08:00 |
|
huang
|
c7f15d3a3e
|
修改留言html样式
|
2015-09-02 20:06:47 +08:00 |
|
sw
|
c2b09c32b2
|
Merge branch 'szzh' into develop
|
2015-09-02 19:56:15 +08:00 |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:52:56 +08:00 |