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
..
_resource.html.erb	栏目增加资源类型，可以添加文件、删除文件、显示文件等	2015-12-11 16:30:50 +08:00
_show_details.html.erb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
_show_post_type.html.erb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
create.js.erb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
destroy.js.erb	解决组织配置资源栏目中，增加/删除栏目不能更新的问题	2015-12-31 14:55:41 +08:00
show.html.erb	Merge branch 'szzh' into develop	2016-01-14 18:22:57 +08:00
show.js.erb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
update.js.erb	实现组织首页功能	2015-12-05 11:30:05 +08:00
update_sub_dir.js.erb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00