 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 |
|
suntao
|
e3b0eae427
|
作业界面展开更多间距
|
2015-09-01 17:38:42 +08:00 |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
2015-09-01 17:37:43 +08:00 |
|
suntao
|
a7ba6b5da2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 17:32:00 +08:00 |
|
suntao
|
7276b5685e
|
表情框按钮间距调整
|
2015-09-01 17:31:44 +08:00 |
|
sw
|
dd3fe5915e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 17:24:17 +08:00 |
 cxt
|
77349fc111
|
点击新建课程/项目时显示提示信息
|
2015-09-01 17:24:35 +08:00 |
|
suntao
|
0b83d188d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 17:21:48 +08:00 |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
2015-09-01 17:21:17 +08:00 |
|
cxt
|
80b97c5692
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 17:09:01 +08:00 |
|
cxt
|
21cb59a7ae
|
点击发布作业的取消按钮时收起输入框
|
2015-09-01 17:08:52 +08:00 |
 lizanle
|
a8652cbe43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 17:04:33 +08:00 |
|
lizanle
|
262f013b51
|
发送资源到项目课程 名称要显示完全
|
2015-09-01 17:04:26 +08:00 |
|
cxt
|
7aef734113
|
点击发布作业的取消按钮时还原截止日期和课程列表下拉框的默认值
|
2015-09-01 16:59:54 +08:00 |
|
sw
|
d0743e4dbf
|
缺陷显示界面描述增加html_safe
|
2015-09-01 16:48:56 +08:00 |
|
cxt
|
de1708b8df
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
2015-09-01 16:41:49 +08:00 |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
|
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
|
guange
|
fcd7506181
|
修正一个样式
|
2015-09-01 16:33:29 +08:00 |
|
sw
|
e4559dce78
|
作业列表样式调整，作业列表取消自动加载，增加加载更多按钮
|
2015-09-01 16:30:39 +08:00 |
|
suntao
|
73d0e675c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:30:36 +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 |
|
cxt
|
735c374f73
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
2015-09-01 16:23:44 +08:00 |
|
sw
|
5b073c5289
|
Merge branch 'guange_homework' into szzh
|
2015-09-01 16:21:35 +08:00 |
|
sw
|
da9c374ed9
|
111
|
2015-09-01 16:21:00 +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 |
|
huang
|
7361f40b0c
|
修改项目资源时间显示跳转错误页面问题
|
2015-09-01 16:12:37 +08:00 |
|
cxt
|
81b317684a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-09-01 16:05:00 +08:00 |
|
sw
|
2de8f17568
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:01:42 +08:00 |
|
sw
|
c01b71739a
|
增加加载更多按钮
|
2015-09-01 16:01:00 +08:00 |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:45:49 +08:00 |
|
cxt
|
d0c4bb9470
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 15:45:36 +08:00 |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
2015-09-01 15:43:59 +08:00 |