You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tim e966972750 Merge branch 'develop' into cs_optimize_txz ... Conflicts: app/views/versions/index.html.erb		9 years ago
..
_arrow_show.erb	…
_attachement_list.html.erb	…
_course_file.html.erb	如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。	9 years ago
_course_file_dense_edit.html.erb	…
_course_file_filter_order.html.erb	…
_course_list.html.erb	…
_course_new.html.erb	…
_course_show_all_attachment.html.erb	…
_course_sort_by_attachtypel.html.erb	…
_file_description.html.erb	…
_file_tools.html.erb	…
_hidden_file.html.erb	…
_import_files.html.erb	…
_new.html.erb	…
_new_style_attachment_list.html.erb	…
_org_order_filter.html.erb	…
_org_subfield_list.html.erb	…
_org_subfield_upload_attachment_list.html.erb	…
_org_upload_attachment_list.html.erb	…
_org_upload_attachment_list_banner.html.erb	…
_project_file.html.erb	如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。	9 years ago
_project_file_dense_edit.html.erb	…
_project_file_list.html.erb	…
_project_file_new.html.erb	…
_project_list.html.erb	…
_resource_detail.html.erb	解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白	9 years ago
_show_all_attachment.html.erb	…
_show_quote_resource.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	9 years ago
_show_quote_resource_org_subfield.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	9 years ago
_show_quote_resource_project.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	9 years ago
_sort_by_attachtypel.html.erb	…
_subfield_files.html.erb	Merge branch 'develop' into cs_optimize_txz	9 years ago
_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	…
_upload_org_new_files.html.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
_upload_org_new_files_banner.html.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
_upload_project_files.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
_upload_show.html.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
_upload_show_project.html.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
_upload_subfield_file.html.erb	提交与取消按钮间添加间距；图标不显示等	9 years ago
create.js.erb	…
file_hidden.js.erb	…
getattachtype.html.erb	…
getattachtype.js.erb	…
index.html.erb	…
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	…
update_file_description.js.erb	…
upload_file_show.js.erb	…
upload_files_menu.js.erb	…