daiao 9ff728f080 Merge branch 'develop' into daiao_dev ... Conflicts: app/views/layouts/_syllabus_base_info.html.erb		2016-07-25 10:03:50 +08:00
..
_delete_syllabus.html.erb	修复删除班级后再删除课程，提示错误的问题	2016-07-07 16:55:34 +08:00
_syllabus_course_list.html.erb	样式调整	2016-07-22 17:13:40 +08:00
delete_syllabus.js.erb	课程大纲的删除和课程大纲描述的删除	2016-07-01 16:25:52 +08:00
edit.html.erb	样式调整	2016-07-22 18:20:11 +08:00
edit_syllabus_eng_name.js.erb	课程大纲	2016-07-01 11:11:53 +08:00
edit_syllabus_title.js.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
new.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	2016-07-07 15:08:34 +08:00
show.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
syllabus_courselist.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
syllabus_courselist.js.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
update_base_info.js.erb	课程大纲	2016-07-01 11:11:53 +08:00