上次更新,写了什么其实已经忘了
问答题属性添加
选择题录入
Merge pull request #1 from himmel22/master

选择题录入
试题编辑:
	重构teacher_text_question_form,区分新增试题和更新试题
auto paper WIP
修改为本底数据库
问答题修改功能完成
menu提出
自动生成试卷 表单页
Merge branch 'master' of https://github.com/himmel22/jplesson into himmel22-master

Conflicts:
	sites/all/modules/teacher/teacher.module
试题模块:添删改查 完成
试卷自动生成系统
Merge remote-tracking branch 'wuqian/master'
Merge pull request #4 from himmel22/master

试卷自动生成系统
冲突处理
批量导入试题
Merge pull request #5 from himmel22/master

批量导入试题
学生做题系统
Merge branch 'master' of https://github.com/WuQian/jplesson

Conflicts:
	sites/all/modules/teacher/question.inc