 sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:17:34 +08:00 |
 lizanle
|
5135f749a4
|
调整回复框高度
|
2015-09-02 18:10:20 +08:00 |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
2015-09-02 18:06:05 +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 |
 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 |
|
sw
|
8fc7760c02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:06:12 +08:00 |
|
suntao
|
4259540f53
|
作业列表宽度调整
|
2015-09-02 17:03:01 +08:00 |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
2015-09-02 16:12:33 +08:00 |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:16 +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
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 14:32: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 |
|
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 |
|
sw
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
2015-09-02 14:10:41 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +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 |
 ouyangxuhua
|
16e018a444
|
更改未读消息样式的字体大小
|
2015-09-02 10:55:40 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
 guange
|
d5be41eebc
|
merge
|
2015-09-02 10:41:59 +08:00 |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
2015-09-02 10:27:10 +08:00 |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
2015-09-02 09:25:34 +08:00 |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
2015-09-02 09:05:52 +08:00 |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
2015-09-01 17:21:17 +08:00 |
|
suntao
|
313ee0f9d8
|
footer对齐调整
|
2015-09-01 16:30:10 +08:00 |
|
suntao
|
59bbfeb0b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:25:22 +08:00 |
|
suntao
|
56644ca173
|
点击展开更多样式
|
2015-09-01 16:25:05 +08:00 |
|
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
2015-09-01 15:43:59 +08:00 |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
2015-09-01 15:28:03 +08:00 |
|
huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 15:24:51 +08:00 |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
2015-09-01 15:10:56 +08:00 |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 14:40:24 +08:00 |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
2015-09-01 14:37:34 +08:00 |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
2015-09-01 14:18:44 +08:00 |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 11:29:53 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
2015-09-01 11:25:52 +08:00 |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
2015-09-01 10:43:30 +08:00 |
|
ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
2015-09-01 09:56:59 +08:00 |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
2015-09-01 09:42:03 +08:00 |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
2015-09-01 09:13:34 +08:00 |