alan b7a89d6108 Merge branch 'shaproup' into szzh ... Conflicts: app/models/course.rb app/models/project.rb app/views/contests/show_attendingcontest.html.erb app/views/files/_course_file.html.erb app/views/files/_course_new.html.erb app/views/layouts/_base_footer.html.erb Signed-off-by: alan <547533434@qq.com>		2014-11-13 09:59:20 +08:00
..
_course_file.html.erb	Merge branch 'shaproup' into szzh	2014-11-13 09:59:20 +08:00
_course_file_dense_edit.html.erb	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
_course_new.html.erb	Merge branch 'shaproup' into szzh	2014-11-13 09:59:20 +08:00
_course_show_all_attachment.html.erb	#1381修复选择相关内容类型、文件类型后，资源列表表头显示异常的BUG	2014-10-21 16:38:16 +08:00
_course_sort_by_attachtypel.html.erb	#1381修复选择相关内容类型、文件类型后，资源列表表头显示异常的BUG	2014-10-21 16:38:16 +08:00
_new.html.erb	修改文件上传界面样式	2014-07-02 14:58:52 +08:00
_project_file.html.erb	Signed-off-by: alan <547533434@qq.com>	2014-11-06 15:58:15 +08:00
_project_file_dense_edit.html.erb	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
_show_all_attachment.html.erb	#994 修复项目资源下载排序问题	2014-10-23 15:29:33 +08:00
_sort_by_attachtypel.html.erb	#1381修复选择相关内容类型、文件类型后，资源列表表头显示异常的BUG	2014-10-21 16:38:16 +08:00
create.js.erb	添加课程资源文件分类显示视图	2014-06-11 16:14:49 +08:00
getattachtype.html.erb	修改bug《选定了内容类型后再点击表头进行排序总是返回一个空白页》	2014-10-28 23:38:14 +08:00
getattachtype.js.erb	Signed-off-by: alan <547533434@qq.com>	2014-10-28 22:34:51 +08:00
index.html.erb	Signed-off-by: alan <547533434@qq.com>	2014-10-28 22:34:51 +08:00
new.html.erb	下拉文件菜单	2014-03-11 10:45:01 +08:00