4 Commits

Author	SHA1	Message	Date
ouyangxuhua	135cb410bc	1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突	2016-01-27 15:29:15 +08:00
Tim	8feea07825	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb	2016-01-14 15:59:50 +08:00
ouyangxuhua	d6e7a2ade5	解决一些bug	2016-01-14 12:51:01 +08:00
ouyangxuhua	6cfda615d6	1.解决一些bug;2.组织子目录功能实现	2016-01-13 15:17:13 +08:00