Commit Graph

25 Commits

Author SHA1 Message Date
cxt d64aba1391 作业的编辑 2017-05-23 18:52:58 +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 c9593f7d17 实训作业 2017-05-22 21:31:28 +08:00
huang 65e85e7bdc 实训作业(未完) 2017-05-22 15:52:45 +08:00
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
daiao 77ce7da426 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 19:39:24 +08:00
daiao a8401ac241 作业列表7个tab与收缩框并列查询 2017-05-19 19:39:04 +08:00
huang 7ad005d28e 合作者提供删除功能 2017-05-19 17:14:15 +08:00
huang 287ddf7115 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:56:31 +08:00
huang f88bf9bcdb 实训添加合作者功能 2017-05-19 16:56:09 +08:00
daiao 9c801959fb 我的主页课堂列表与课程页列表添加切换列表事件 2017-05-19 16:44:57 +08:00
daiao c2101ad90b 新版上传头像的弹框 2017-05-19 15:46:19 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
cxt b74570f517 Merge branch 'develop' into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_courses.html.erb
	public/stylesheets/css/edu-public.css
2017-05-18 15:44:57 +08:00
cxt 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00
daiao beb4bf04fc 作业列表的tab加入点击事件 2017-05-18 15:38:29 +08:00
cxt 528e08be04 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-05-13 22:24:14 +08:00
cxt 0e868b45d7 班级新建和设置(除模块设置) 2017-05-13 22:23:53 +08:00
miss b1b061eeaa 调整样式及部分结构 2017-05-12 21:24:01 +08:00
cxt 9e04ed6a2d 课程的资源和题库选用到班级 2017-05-08 15:26:16 +08:00
cxt 6fe571cc99 课程资源库和课程题库 2017-05-05 19:36:32 +08:00
cxt 5e82ef00ba 身份认证 2017-05-04 14:33:50 +08:00
cxt 60d33cf661 课程首页(除课程资源库和课程题库) 2017-04-28 22:53:34 +08:00