huang 9e0176bc55 Merge branch 'hjq_beidou' into develop ... Conflicts: app/controllers/organizations_controller.rb app/helpers/organizations_helper.rb db/schema.rb public/images/homepage_icon.png public/stylesheets/new_user.css		2016-05-06 10:16:56 +08:00
..
blog_comments_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
blogs_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
org_courses_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
org_document_comment_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
org_member_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
org_projects_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
org_subfields_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
organizations_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
shield_activities_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
shield_wechat_messages_controller_spec.rb	缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息	2016-04-27 10:28:36 +08:00
sub_document_comments_controller_spec.rb	二级目录框架及结构	2016-04-28 17:36:29 +08:00
sub_domains_controller_spec.rb	完成组织二级域名	2016-04-27 17:02:44 +08:00
subfield_subdomain_dirs_controller_spec.rb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
system_messages_controller_spec.rb	代码重置	2016-03-11 10:18:10 +08:00