6 Commits (f94b048af29fa9c8d8b2547d0d97b80473d8a01e)

Author	SHA1	Message	Date
alan	e4fc9f39e0	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
alan	03d855f5d5	修改资源区分页问题	10 years ago
ouyangxuhua	7f0959c972	题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式	10 years ago
alan	e9069f0225	fix merge bug	10 years ago
alan	eb1c6ccf85	Merge branch 'alan_develop' into develop ... Conflicts: app/views/users/_resource_share_for_orgs.html.erb app/views/users/_resource_share_for_project_popup.html.erb app/views/users/_resource_share_popup.html.erb app/views/users/search_user_course.js.erb app/views/users/search_user_org.js.erb app/views/users/search_user_project.js.erb	10 years ago
ouyangxuhua	1a1d5b4c49	解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题	10 years ago