 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
|
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 |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
2015-09-02 19:52:44 +08:00 |
|
sw
|
6a6fbea446
|
提交作品样式
|
2015-09-02 19:41:45 +08:00 |
|
huang
|
8d7ca25c02
|
Merge branch 'dev_hjq' into szzh
|
2015-09-02 19:39:22 +08:00 |
|
huang
|
1ba0c86828
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 19:38:31 +08:00 |
|
huang
|
70f80bb36f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:36:29 +08:00 |
|
huang
|
7d6d349c4d
|
讨论区鼠标经过显示html代码
|
2015-09-02 19:35:51 +08:00 |
|
lizanle
|
b4ae611718
|
贴吧交流url
|
2015-09-02 19:14:13 +08:00 |
|
sw
|
c2bfbfecee
|
编辑作业按钮隐藏
|
2015-09-02 19:11:34 +08:00 |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
|
lizanle
|
b4a7cb24b9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-02 18:32:36 +08:00 |
|
lizanle
|
0e68bbc5bd
|
调整回复框高度
|
2015-09-02 18:32:29 +08:00 |
|
guange
|
1c8b24822d
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-02 18:25:16 +08:00 |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:17:34 +08:00 |
 cxt
|
31fcd68623
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:18:20 +08:00 |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
2015-09-02 18:18:08 +08:00 |
|
lizanle
|
5135f749a4
|
调整回复框高度
|
2015-09-02 18:10:20 +08:00 |
|
guange
|
dd4e67ebdb
|
使用新的作业提交界面
|
2015-09-02 18:09:52 +08:00 |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
2015-09-02 18:06:05 +08:00 |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:02:16 +08:00 |
|
lizanle
|
f05270a519
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-02 18:01:59 +08:00 |
|
lizanle
|
6fdd3a8e86
|
调整回复框高度
|
2015-09-02 18:01:51 +08:00 |