Commit Graph

50 Commits

Author SHA1 Message Date
cxt 6a4ba18126 作业设置的完善 2017-06-09 11:19:14 +08:00
cxt 1f04cd1285 作品评分 2017-06-08 17:39:29 +08:00
cxt 9e9772b24d 去掉课程名称的前后空白符 2017-06-08 15:03:13 +08:00
cxt 25c0c9cab7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-07 16:19:48 +08:00
daiao 9ea224a01c 试用授权相关的遮罩页面 2017-06-07 10:19:55 +08:00
cxt 75b37651fa 班级资源页面的发送点击无效,应该与课程的选用按钮相类似 2017-06-06 17:20:33 +08:00
cxt ee536468f3 作业页面新建作业,没有选择类别就进行确定,给出的提示做一行显示在作业类别上方 2017-06-06 11:07:06 +08:00
cxt 6fc34f0ad0 班级设置中的班级名称,框内例子与框外提示不一致,请按第二张图进行修改 2017-06-05 16:45:00 +08:00
cxt 292b72f950 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 20:28:21 +08:00
cxt 49bab55334 作品列表的“分班情况”无法勾选2个 2017-06-02 19:24:51 +08:00
cxt 02f83c965f 验证拖拽框 2017-06-02 19:06:37 +08:00
daiao 560655c28e 立即激活邮箱 2017-06-02 17:51:13 +08:00
cxt c520c31640 弹框调整 2017-06-02 14:52:07 +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
huang b5e3d9de3f 解决实训作业无法创建的问题 2017-06-02 11:21:23 +08:00
cxt 24673ef192 作业设置页的“×”取消按钮点击应该有弹框提示 2017-05-31 11:02:30 +08:00
cxt 8d0bb43e9c 修改密码页原始密码的验证有错 2017-05-27 11:15:06 +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
Linda de7b0089ee 修改资料的安全设置中,icon样式和显示问题 2017-05-26 17:04:22 +08:00
cxt 8454330981 作业动态的齿轮菜单内容请修正 2017-05-26 15:46:26 +08:00
cxt 96db0b75f9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/account/user_join.html.erb
	app/views/layouts/base_edu_course.html.erb
2017-05-25 17:34:51 +08:00
huang 8e7756d45c js弹框点击确定的时候隐藏弹框 2017-05-25 15:07:11 +08:00
cxt 6705c35b82 修改密码的“新密码”提示和check请修正、避免邮箱恶意注册,请增加验证块 2017-05-25 11:12:59 +08:00
cxt 0224442439 作业的匿评设置选择了匿评,但是评分设置无法正确显示、评分设置选择了“单项评分优先”却无法正确保存 2017-05-24 19:57:59 +08:00
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