Commit Graph

74 Commits

Author SHA1 Message Date
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00
cxt 0bd49899c7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-23 20:02:29 +08:00
cxt 7d34acfc95 分组作业的相关调整 2017-06-23 19:46:21 +08:00
daiao 2e93350e15 缺陷修复 2017-06-23 19:27:22 +08:00
daiao 6f04200f5f 修复缺陷 2017-06-23 17:32:26 +08:00
cxt a9d556dc60 实训重置弹框 2017-06-23 15:13:45 +08:00
daiao e2c15578c4 Merge branch 'dev_daiao' into develop
Conflicts:
	app/controllers/managements_controller.rb
	config/routes.rb
2017-06-23 11:20:15 +08:00
cxt 96165230ad 实训流程 2017-06-23 10:38:40 +08:00
daiao 69d5a6eafb 用户试用认证 2017-06-22 17:03:00 +08:00
daiao 6c95a2732a 用户授权列表 2017-06-22 09:31:08 +08:00
daiao 08b7446bd0 用户认证 2017-06-19 17:04:55 +08:00
cxt 4130c6045a Merge branch 'develop' into dev_cxt 2017-06-16 19:09:18 +08:00
cxt d1637b3cde 个人主页的tab样式与“我的实训”保持一致 2017-06-16 19:07:31 +08:00
daiao de26c97dbc 实训合作者搜索上次搜索的内容不显示 2017-06-16 17:42:41 +08:00
daiao a0562d01e9 安全设置邮箱绑定设置了Hotmail的邮箱,点击去查看跳转页面不正确 2017-06-16 17:20:27 +08:00
daiao aaac786745 修改密码中重设新密码不正确后给出的提示会一直显示到保存成功,应该每输入一次密码就应该做一次判断 2017-06-16 16:55:07 +08:00
cxt 033c22ee3f 上传头像点击确定跳转 2017-06-16 16:50:50 +08:00
daiao 4584276cbd Merge branch 'dev_daiao' into develop 2017-06-16 15:33:31 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
daiao 91d3bc04b5 个人主页的课堂列表和实训列表底部的“点击查看全部”更换成换页 2017-06-14 10:27:49 +08:00
cxt f77b829fdc 作业详情页面的头部样式需和我的实训页面样式一样 2017-06-12 17:33:28 +08:00
cxt da87db878b 邮箱注册的调整 2017-06-12 16:02:07 +08:00
cxt b00818d427 作业评分设置的完善 2017-06-09 20:45:04 +08:00
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