daiao f3a4ca2a51 Merge branch 'dev_xucheng' into dev_daiao ... Conflicts: app/controllers/managements_controller.rb app/views/student_work/index.html.erb public/stylesheets/css/edu-common.css		2017-08-29 09:14:22 +08:00
..
_answer_form.html.erb	实训tpm参考答案页面，编辑时参考答案显示为“参考答案1111” 正常	2017-08-18 09:41:03 +08:00
_content_list.html.erb	Merge branch 'develop' into dev_cs	2017-08-25 17:05:25 +08:00
_edit_answer.html.erb	Issues修改	2017-08-04 16:39:12 +08:00
_edit_evaluating.html.erb	项目实训的阶段内容划分5个tab进行编辑	2017-07-20 16:25:44 +08:00
_edit_propaedeutics.html.erb	Issues修改	2017-08-04 16:39:12 +08:00
_edit_scoring.html.erb	预备知识更新数据	2017-07-28 16:27:10 +08:00
_edit_skill.html.erb	issue解决	2017-08-28 17:00:44 +08:00
_edit_task_pass.html.erb	TPI/TPM字母超过范围未换行	2017-08-04 21:08:51 +08:00
_evaluating_form.html.erb	trustie注册时登录名是不能少于4个字符，但是修改资料时登录名可以改为1位数	2017-08-09 15:48:26 +08:00
_form.html.erb	个人成长记录中心页面样式修改	2017-08-10 14:10:01 +08:00
_propaedeutics_form.html.erb	预备知识更新数据	2017-07-28 16:27:10 +08:00
_score_form.html.erb	评分设置中奖励经验值不正确，tip说明不正确，技能勋章的tip说明也不正确	2017-07-28 16:55:54 +08:00
_skill_form.html.erb	Merge branch 'dev_xucheng' into dev_daiao	2017-08-29 09:14:22 +08:00
_task_pass_form.html.erb	新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了	2017-08-22 16:11:56 +08:00
destroy.js.erb	实训tpm的关卡删除功能遗漏	2017-08-08 15:35:34 +08:00
edit.html.erb	"已保存"tip	2017-08-28 11:15:33 +08:00
index.html.erb	技能标签	2017-08-28 16:56:31 +08:00
index_down.js.erb	first commit	2017-04-07 10:16:13 +08:00
index_up.js.erb	first commit	2017-04-07 10:16:13 +08:00
new.html.erb	完成单选多选新建	2017-07-21 10:30:40 +08:00
show.html.erb	优化新建实训代码，添加事务及异常处理	2017-08-07 14:28:43 +08:00