ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua ... Conflicts: app/helpers/application_helper.rb app/views/organizations/_org_course_homework.html.erb app/views/organizations/_org_course_news.html.erb app/views/organizations/_org_project_issue.html.erb app/views/organizations/_project_message.html.erb app/views/organizations/_show_org_document.html.erb app/views/users/_user_message_course.html.erb		2016-03-15 13:40:33 +08:00
..
_arrow_show.erb	…
_attachement_list.html.erb	…
_course_file.html.erb	去掉全站搜索	2016-03-04 16:10:41 +08:00
_course_file_dense_edit.html.erb	…
_course_list.html.erb	…
_course_new.html.erb	…
_course_show_all_attachment.html.erb	…
_course_sort_by_attachtypel.html.erb	…
_file_tools.html.erb	…
_hidden_file.html.erb	…
_import_files.html.erb	0	2016-03-05 03:16:04 +08:00
_new.html.erb	…
_new_style_attachment_list.html.erb	…
_org_subfield_list.html.erb	公开组织的资源，非成员不能看到私有资源	2016-03-07 17:41:43 +08:00
_org_subfield_upload_attachment_list.html.erb	…
_project_file.html.erb	课程、项目、组织资源导入	2016-03-03 17:15:47 +08:00
_project_file_dense_edit.html.erb	…
_project_file_list.html.erb	…
_project_file_new.html.erb	…
_project_list.html.erb	0	2016-03-05 03:16:04 +08:00
_resource_detail.html.erb	0	2016-03-05 03:16:04 +08:00
_show_all_attachment.html.erb	…
_show_quote_resource.html.erb	…
_show_quote_resource_org_subfield.html.erb	…
_show_quote_resource_project.html.erb	…
_sort_by_attachtypel.html.erb	…
_subfield_files.html.erb	1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写	2016-03-10 14:38:33 +08:00
_subfield_files_list.html.erb	…
_subfield_tags.html.erb	…
_tag_yun.html.erb	…
_tag_yun_project.html.erb	…
_tool_settings.html.erb	…
_upload_course_files.erb	附件上传样式	2016-03-10 16:43:25 +08:00
_upload_project_files.erb	…
_upload_show.html.erb	…
_upload_show_project.html.erb	…
_upload_subfield_file.html.erb	…
create.js.erb	…
file_hidden.js.erb	…
getattachtype.html.erb	…
getattachtype.js.erb	…
index.html.erb	0	2016-03-05 03:16:04 +08:00
index.js.erb	…
new.html.erb	…
quote_resource_show.js.erb	…
quote_resource_show_org_subfield.js.erb	…
quote_resource_show_project.js.erb	…
republish_file.js.erb	…
search.js.erb	…
search_files_in_subfield.js.erb	…
search_org_subfield_tag_attachment.js.erb	…
search_project.js.erb	…
search_tag_attachment.js.erb	…
searchone4reload.html.erb	…
subfield_upload_file.js.erb	…
upload_file_show.js.erb	…
upload_files_menu.js.erb	…