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
..
blog_comments_controller_spec.rb	简单博客功能	2015-10-24 15:34:43 +08:00
blogs_controller_spec.rb	简单博客功能	2015-10-24 15:34:43 +08:00
org_courses_controller_spec.rb	1.创建组织课程关联表，建立相应模型及控制器；	2015-11-17 17:34:50 +08:00
org_document_comment_controller_spec.rb	组织模块功能实现	2015-11-12 09:32:00 +08:00
org_member_controller_spec.rb	组织模块功能实现	2015-11-12 09:32:00 +08:00
org_projects_controller_spec.rb	组织模块功能实现	2015-11-12 09:32:00 +08:00
org_subfields_controller_spec.rb	组织界面增加分栏	2015-12-04 17:34:48 +08:00
organizations_controller_spec.rb	建立组织、成员表及模型控制器；	2015-11-03 11:19:38 +08:00
shield_activities_controller_spec.rb	增加组织/个人屏蔽项目/课程动态功能	2016-01-08 14:12:55 +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	添加功能：管理员界面发送系统消息	2015-09-09 17:05:32 +08:00