ouyangxuhua 7dc02d2c4f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq ... Conflicts: app/views/organizations/_show_org_document.html.erb		2015-11-12 18:00:25 +08:00
..
_new_org_avatar_form.html.erb	组织模块动态及配置	2015-11-05 17:57:07 +08:00
_org_member_list.html.erb	组织模块动态及配置	2015-11-05 17:57:07 +08:00
_show_org_document.html.erb	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-11-12 18:00:25 +08:00
autocomplete_search.js.erb	组织模块功能实现	2015-11-12 09:32:00 +08:00
check_uniq.js.erb	组织模块动态及配置	2015-11-05 17:57:07 +08:00
create.js.erb	建立组织、成员表及模型控制器；	2015-11-03 11:19:38 +08:00
new.html.erb	组织模块动态及配置	2015-11-05 17:57:07 +08:00
set_homepage.js.erb	组织模块功能实现	2015-11-12 09:32:00 +08:00
setting.html.erb	组织模块功能缺陷修改	2015-11-12 17:52:47 +08:00
show.html.erb	组织模块功能实现	2015-11-12 14:55:31 +08:00