Commit Graph

9 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
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
huang ae10991ae6 合作者权限控制 2017-05-19 17:30:30 +08:00
huang f88bf9bcdb 实训添加合作者功能 2017-05-19 16:56:09 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
huang 5da2a7ee59 查看关卡权限修改 2017-04-28 10:21:02 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00