You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		9 years ago
..
blog_comments_controller_spec.rb	代码重置	9 years ago
blogs_controller_spec.rb	代码重置	9 years ago
org_courses_controller_spec.rb	代码重置	9 years ago
org_document_comment_controller_spec.rb	代码重置	9 years ago
org_member_controller_spec.rb	代码重置	9 years ago
org_projects_controller_spec.rb	代码重置	9 years ago
org_subfields_controller_spec.rb	代码重置	9 years ago
organizations_controller_spec.rb	代码重置	9 years ago
shield_activities_controller_spec.rb	代码重置	9 years ago
shield_wechat_messages_controller_spec.rb	缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息	9 years ago
sub_document_comments_controller_spec.rb	二级目录框架及结构	9 years ago
sub_domains_controller_spec.rb	完成组织二级域名	9 years ago
subfield_subdomain_dirs_controller_spec.rb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
system_messages_controller_spec.rb	代码重置	9 years ago