Commit Graph

5 Commits

Author SHA1 Message Date
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后,编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
ouyangxuhua c81f2f738a Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
	app/controllers/org_document_comments_controller.rb
	app/views/org_document_comments/_attachment.html.erb
2015-12-24 11:13:20 +08:00
ouyangxuhua 59f42bb54f 1.将添加附加功能加入到组织列表中的新建组织文章;
2.解决编辑文章附件不能上传的问题。
2015-12-24 11:09:57 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
	public/stylesheets/org.css
2015-12-24 10:40:00 +08:00
ouyangxuhua 9dc2cb8541 添加组织文章附件功能 2015-12-23 10:40:50 +08:00