6 Commits

Author	SHA1	Message	Date
alan	e4fc9f39e0	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-03-29 16:43:52 +08:00
alan	03d855f5d5	修改资源区分页问题	2016-03-29 15:46:13 +08:00
ouyangxuhua	7f0959c972	题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式	2016-03-29 15:25:22 +08:00
alan	e9069f0225	fix merge bug	2016-03-29 12:29:23 +08:00
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	2016-03-29 11:36:49 +08:00
ouyangxuhua	1a1d5b4c49	解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题	2016-03-28 19:20:09 +08:00