cxt 139a0597d8 Merge branch 'dev_xucheng' into develop ... Conflicts: app/views/layouts/base_management.html.erb app/views/managements/_class_shixuns_list.html.erb app/views/managements/_users_authorization_list.html.erb app/views/managements/identity_authentication.html.erb app/views/managements/shixun_authorization.html.erb app/views/managements/subject_authorization.html.erb config/routes.rb public/javascripts/edu/account.js public/javascripts/edu/syllabus.js		2017-08-11 15:20:56 +08:00
..
account.js	超级管理员相关页面	2017-08-11 11:27:04 +08:00
application.js	课程的新建和编辑的下拉框调整	2017-08-10 17:30:53 +08:00
base_edu.js	课程的新建和编辑的下拉框调整	2017-08-10 17:30:53 +08:00
course.js	班级讨论区的上线	2017-07-28 16:59:17 +08:00
homework.js	超级管理员相关页面	2017-08-11 11:27:04 +08:00
management.js	管理员用户列表页面	2017-07-04 09:51:51 +08:00
shixun.js	实训合作者搜索上次搜索的内容不显示	2017-06-16 17:42:41 +08:00
syllabus.js	超级管理员相关页面	2017-08-11 11:27:04 +08:00
user.js	个人主页的tab样式与“我的实训”保持一致	2017-06-16 19:07:31 +08:00