Commit Graph

9 Commits

Author SHA1 Message Date
huang 4da7520205 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/student_work/show.html.erb
2017-05-23 15:57:19 +08:00
huang 4b2d81dd8c 分组作业 2017-05-23 15:55:30 +08:00
cxt 1e8a36a8d2 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/student_work/show.html.erb
2017-05-23 15:32:16 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00
huang c50b7b57e7 作品详情添加评论 2017-05-23 14:53:35 +08:00
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
huang c56d6910bd 作品详情评论功能及删除功能 2017-05-17 18:18:00 +08:00
huang 59fadefc4f 编程作业、普通作业作品显示 2017-05-17 15:22:48 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00