Commit Graph

5 Commits

Author SHA1 Message Date
huang 61f2f632ca Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_edu.html.erb
2017-05-22 11:14:18 +08:00
Linda 5cec15cd3b 新建班级页按照新建课程调整 2017-05-19 11:30:10 +08:00
cxt 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00
cxt 0e868b45d7 班级新建和设置(除模块设置) 2017-05-13 22:23:53 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00