huang ca26b0d819 Merge branch 'szzh' into dev_hjq ... Conflicts: app/views/courses/_course_members.html.erb app/views/courses/settings.html.erb app/views/members/create.js.erb app/views/members/destroy.js.erb app/views/members/update.js.erb app/views/users/show.html.erb public/javascripts/course.js		2015-04-22 09:31:13 +08:00
..
appliedproject.js.erb	添加项目管理员审核已申请用户界面及逻辑	2014-05-22 11:58:43 +08:00
autocomplete.js.erb	完成项目配置-成员模块	2015-04-14 11:47:47 +08:00
create.js.erb	Merge branch 'szzh' into dev_hjq	2015-04-22 09:31:13 +08:00
destroy.js.erb	Merge branch 'szzh' into dev_hjq	2015-04-22 09:31:13 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
show.api.rsb	first commit	2013-08-01 10:33:49 +08:00
update.js.erb	Merge branch 'szzh' into dev_hjq	2015-04-22 09:31:13 +08:00