 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 |
|
huang
|
4c76292e5e
|
message--viewed
|
2015-09-02 18:00:36 +08:00 |
 suntao
|
b24909df8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:41:32 +08:00 |
|
suntao
|
1fff00bab0
|
回复模块改动
|
2015-09-02 17:41:19 +08:00 |
|
huang
|
d2b8d94918
|
Merge branch 'dev_hjq' into szzh
|
2015-09-02 17:20:07 +08:00 |
|
huang
|
273e1ea6b1
|
修改项目讨论区引用样式
|
2015-09-02 17:08:20 +08:00 |
|
sw
|
8fc7760c02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:06:12 +08:00 |
|
sw
|
45c54dabad
|
课程内创建作业代码还原
|
2015-09-02 17:04:01 +08:00 |
|
suntao
|
9c17ad36e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:03:19 +08:00 |
|
suntao
|
4259540f53
|
作业列表宽度调整
|
2015-09-02 17:03:01 +08:00 |
|
sw
|
e360ea0bc7
|
回复框高度为50px
|
2015-09-02 16:34:03 +08:00 |
|
huang
|
fcb9978a05
|
消息鼠标经过时显示html内容
|
2015-09-02 16:21:47 +08:00 |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
2015-09-02 16:12:33 +08:00 |
|
huang
|
a97e43923f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 15:01:25 +08:00 |
|
sw
|
5ea68dcd7d
|
Merge branch 'szzh' into develop
|
2015-09-02 14:38:42 +08:00 |
|
huang
|
4b2385cb81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:38:30 +08:00 |
|
sw
|
9df301b4cc
|
取消无用参数
|
2015-09-02 14:37:58 +08:00 |
|
huang
|
43f99c45e8
|
消息
|
2015-09-02 14:37:57 +08:00 |
|
sw
|
917442c0e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_list.html.erb
|
2015-09-02 14:37:46 +08:00 |
|
sw
|
05739931f3
|
作业列表点击加载更多
|
2015-09-02 14:34:32 +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 |