cxt 42351bc93d Merge branch 'dev_cxt' into dev_cs ... Conflicts: app/views/layouts/_group_children_list.html.erb app/views/subjects/new.html.erb		2017-09-22 14:56:43 +08:00
..
_choose_shixun.html.erb	课程实训的新建编辑	2017-07-14 09:58:20 +08:00
_course_shixun_list.html.erb	复选框列表在翻页后原来页的选择被丢掉了	2017-08-16 17:34:25 +08:00
_my_course_shixun_list.html.erb	复选框列表在翻页后原来页的选择被丢掉了	2017-08-16 17:34:25 +08:00
_publish_notice.html.erb	实训套件模块的改版	2017-07-26 14:42:20 +08:00
_subject_createnew.html	实训课程改为：实训路径	2017-08-28 09:14:09 +08:00
_subject_list.html.erb	把已发布的路径排在最前面	2017-09-22 10:19:59 +08:00
_subject_top.html.erb	实训路径的教师团队当前用户可编辑自己的简介	2017-08-30 16:43:08 +08:00
append_to_stage.js.erb	我的关注新页加最小高度	2017-08-06 17:14:55 +08:00
choose_subject_shixun.js.erb	课程实训的新建编辑	2017-07-14 09:58:20 +08:00
destroy.js.erb	issue的修改	2017-08-23 09:24:32 +08:00
edit.html.erb	实训路径的简介、学习须知，请改为 ke 编辑器，需要插入图片	2017-09-21 11:07:44 +08:00
index.html.erb	阴影	2017-09-08 20:31:52 +08:00
index.js.erb	课程实训	2017-07-13 09:20:25 +08:00
new.html.erb	Merge branch 'dev_cxt' into dev_cs	2017-09-22 14:56:43 +08:00
new_subject.js.erb	修复500问题	2017-07-23 19:33:36 +08:00
publish.js.erb	实训套件模块的改版	2017-07-26 14:42:20 +08:00
show.html.erb	Merge branch 'develop' into dev_cxt	2017-09-21 17:46:58 +08:00