 huang
|
fcb9978a05
|
消息鼠标经过时显示html内容
|
2015-09-02 16:21:47 +08:00 |
|
huang
|
a97e43923f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 15:01:25 +08:00 |
|
huang
|
4b2385cb81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:38:30 +08:00 |
|
huang
|
43f99c45e8
|
消息
|
2015-09-02 14:37:57 +08:00 |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:34:10 +08:00 |
|
huang
|
5ec742faae
|
Merge branch 'dev_hjq' into szzh
|
2015-09-02 14:33:32 +08:00 |
|
huang
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 14:32:46 +08:00 |
 suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:16 +08:00 |
 cxt
|
9f494bc14a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:35:03 +08:00 |
|
cxt
|
70c2f7de1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
2015-09-02 14:34:51 +08:00 |
|
cxt
|
63f52ea9bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:59 +08:00 |
|
cxt
|
3208574a5e
|
作业和首页的加载更多传递page参数
|
2015-09-02 14:31:46 +08:00 |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
2015-09-02 14:31:03 +08:00 |
 sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:27:43 +08:00 |
|
suntao
|
c2dbd9449e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_homeworks.html.erb
|
2015-09-02 14:24:11 +08:00 |
|
huang
|
fcdf9b3fc1
|
清理数据
|
2015-09-02 14:21:50 +08:00 |
|
sw
|
53c57668aa
|
点击显示更多按钮的显示与隐藏
|
2015-09-02 14:19:47 +08:00 |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
|
suntao
|
9b8270aed1
|
Banner padding调整
|
2015-09-02 14:15:26 +08:00 |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
2015-09-02 14:13:32 +08:00 |
|
sw
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
2015-09-02 14:10:41 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
|
sw
|
0935a7eab1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 13:46:55 +08:00 |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
2015-09-02 13:46:33 +08:00 |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
2015-09-02 11:54:52 +08:00 |
|
sw
|
2538797a52
|
课程论坛回复刷新
|
2015-09-02 11:51:49 +08:00 |
|
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-02 11:51:27 +08:00 |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
2015-09-02 11:50:58 +08:00 |
 ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
2015-09-02 11:46:49 +08:00 |
|
sw
|
bbf4478fc0
|
课程通知回复后不能及时刷新页面
|
2015-09-02 11:45:52 +08:00 |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
2015-09-02 11:20:21 +08:00 |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 11:15:53 +08:00 |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
2015-09-02 11:15:38 +08:00 |
|
sw
|
9728437953
|
作业界面样式
|
2015-09-02 11:02:41 +08:00 |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
2015-09-02 11:00:32 +08:00 |
|
ouyangxuhua
|
16e018a444
|
更改未读消息样式的字体大小
|
2015-09-02 10:55:40 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
|
sw
|
8b8b082077
|
Merge branch 'guange_homework' into szzh
|
2015-09-02 10:50:22 +08:00 |
|
sw
|
6b1e0b1407
|
Merge branch 'guange_homework' into szzh
|
2015-09-02 10:42:36 +08:00 |
 guange
|
d5be41eebc
|
merge
|
2015-09-02 10:41:59 +08:00 |
|
guange
|
45dd48069e
|
submit不能提交的问题
|
2015-09-02 10:40:28 +08:00 |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
2015-09-02 10:27:10 +08:00 |
|
sw
|
e42b6d65db
|
导入作业之后显示所有的作业信息
|
2015-09-02 10:25:22 +08:00 |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
2015-09-02 10:23:22 +08:00 |
|
sw
|
b0060fc03b
|
请选择发送的课程选择
|
2015-09-02 10:13:41 +08:00 |
|
huang
|
469293bc1f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-02 10:09:13 +08:00 |
|
sw
|
59b42e2b33
|
还原ＪＱｕｅｒｙ版本
|
2015-09-02 10:09:05 +08:00 |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
2015-09-02 10:08:37 +08:00 |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
2015-09-02 09:25:34 +08:00 |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
2015-09-02 09:05:52 +08:00 |