 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 |
|
sw
|
eff6d6cafe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:39:20 +08:00 |
|
sw
|
edb7173d83
|
加入课程、新建课程、新建项目按钮样式
|
2015-09-01 15:39:02 +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 |
|
cxt
|
756d703b5a
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
2015-09-01 15:34:08 +08:00 |
|
sw
|
c09478c73f
|
作业列表界面和动态列表界面显示不一致
|
2015-09-01 15:32:56 +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 |
|
sw
|
0994ae9f07
|
项目讨论区回复功能
|
2015-09-01 15:24:37 +08:00 |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
|
suntao
|
4bcb6e53f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:13:13 +08:00 |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
2015-09-01 15:10:56 +08:00 |
|
lizanle
|
a5e39a1049
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:03:36 +08:00 |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
2015-09-01 15:03:24 +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 |
|
cxt
|
a008d9d834
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 14:37:59 +08:00 |
|
cxt
|
8a286bb8a8
|
去掉截止日期的标签
|
2015-09-01 14:37:46 +08:00 |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
2015-09-01 14:37:34 +08:00 |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
2015-09-01 14:18:44 +08:00 |
|
lizanle
|
a78128f5ac
|
搜不到资源的时候 改为没有数据可以展示
|
2015-09-01 14:11:04 +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 |