Commit Graph

95 Commits

Author SHA1 Message Date
cxt c48f1ca3ef Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-16 15:19:20 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
huang 74e2ef9429 添加实训评测任务 2017-06-13 16:03:38 +08:00
huang f0823e7eb7 实名认证方式修改 2017-06-11 15:53:04 +08:00
huang 8f40d7022a 修复登录等问题 2017-06-11 15:45:54 +08:00
huang 3b57616986 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-class.css
2017-06-09 16:55:22 +08:00
cxt db01677247 学生角色时班级头部的分班数样式调整 2017-06-09 09:26:09 +08:00
huang a0cff38470 用户列表试用界面 2017-06-08 16:15:24 +08:00
cxt 4bff7c7d68 班级动态页面的提交作品按钮导致页面样式错乱 2017-06-08 16:05:23 +08:00
huang aaf1135e35 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-common.css
2017-06-07 17:43:52 +08:00
huang 87071cacce 认证 2017-06-07 17:39:24 +08:00
huang db35db4378 身份认证 2017-06-06 17:38:10 +08:00
cxt 0eae7f43e6 作品列表页面的查看作品应该跳转到作品内容页面(同查看操作),目前只是刷新列表页面 2017-06-06 14:45:24 +08:00
cxt cfe48f6295 班级动态中作业标签应该与作业列表中的一致 2017-06-06 14:41:57 +08:00
cxt fa81fee727 作品列表无论是否提交应该都可以评阅 2017-06-02 20:04:49 +08:00
cxt 28c72c7d23 身份认证的图像更换 2017-06-02 15:05:06 +08:00
cxt 6ff88ef129 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 14:27:42 +08:00
cxt 15345d93bd 作品列表的多条件筛选 2017-06-02 14:27:12 +08:00
daiao f19fda9cc8 项目实训的“所有语言”和“所有进展”以及搜索 2017-06-02 10:44:58 +08:00
huang c9d66d35d5 首页title修改 2017-06-01 16:21:53 +08:00
cxt 11b5e6f5aa 作业列表的筛选结果不对 2017-05-27 15:50:01 +08:00
cxt dfb8e6f576 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/courses/settings.html.erb
2017-05-27 10:32:17 +08:00
daiao b050ebc2e8 班级模块整体功能完善 2017-05-27 10:27:11 +08:00
cxt 06e9e7f157 发布作业但是没有为每个学生创建一条空记录 2017-05-27 09:58:52 +08:00
cxt bf317dba48 班级的教师或助教点击头部的“教师”“学生”“分班”应该进入成员管理的相应页面 2017-05-26 10:34:25 +08:00
huang d29ddfd40f 解决实训图片不显示的问题 2017-05-25 16:46:51 +08:00
cxt 0224442439 作业的匿评设置选择了匿评,但是评分设置无法正确显示、评分设置选择了“单项评分优先”却无法正确保存 2017-05-24 19:57:59 +08:00
cxt 4aa6c830b2 作业标签状态有显示空白的 2017-05-24 17:17:00 +08:00
cxt 8f0a0e94f2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 16:28:52 +08:00
cxt 9ca6f450fe 作业列表、定时执行任务 2017-05-24 16:27:55 +08:00
cxt 55e04d2886 作业详情页的回复 2017-05-24 10:49:33 +08:00
daiao 804be70dd1 “我的课堂”的标签请更新为“我的课堂” 2017-05-24 09:24:12 +08:00
huang f439587c44 智能课堂tab title修改 2017-05-23 22:18:45 +08:00
huang 73cd664ba4 实训首页tap显示更正 2017-05-23 21:35:31 +08:00
huang 7fefef3122 平台首页标签改成“高校智能化教学与实训平台” 2017-05-23 21:29:47 +08:00
huang 15b86ea78a 发布实训错误提示等级封装 2017-05-23 20:53:27 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
Linda f281017cec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 17:34:25 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +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
Linda 3933f9a6e3 平台首页的智能课堂块,用的icon与智能课堂的首页使用的icon不一致 2017-05-23 09:38:25 +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
huang 9492725fc8 challenge链接更新问题 2017-05-19 20:36:41 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
huang ed8b14bce1 作品列表相关功能补充 2017-05-18 19:40:51 +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