7 Commits

Author	SHA1	Message	Date
cxt	25cc959576	Merge branch 'szzh' into develop ... Conflicts: app/views/layouts/_user_courses.html.erb app/views/org_subfields/show.html.erb app/views/organizations/_subfield_list.html.erb app/views/users/_resource_share_for_orgs.html.erb	2016-01-14 18:22:57 +08:00
ouyangxuhua	6b7ce68e4a	各种bug解决	2016-01-14 17:52:48 +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	324513fc94	组织栏目子目录功能实现	2016-01-14 10:33:15 +08:00
ouyangxuhua	6cfda615d6	1.解决一些bug;2.组织子目录功能实现	2016-01-13 15:17:13 +08:00
ouyangxuhua	5d9ce929d9	组织栏目子目录	2016-01-13 09:34:33 +08:00
ouyangxuhua	73d377d06d	组织资源栏目显示转发的帖子	2015-12-23 16:49:05 +08:00