Commit Graph

908 Commits

Author SHA1 Message Date
daiao c324ed4ec1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 11:21:26 +08:00
daiao 0bc86d9bd7 实训TPI的评测按钮区域新增“上一关” 2017-09-08 11:21:08 +08:00
huang 4e6be7874c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 11:10:49 +08:00
huang 30517525e9 添加用户行为记录 2017-09-08 11:10:30 +08:00
daiao bad7322c86 实际输出是异常输出则不匹配空格 2017-09-08 09:18:33 +08:00
daiao 918d6b3c95 实训类型 2017-09-07 20:35:30 +08:00
daiao 2b8f057d3d 评测 2017-09-07 19:36:46 +08:00
daiao aff7febcc3 打印日志 2017-09-07 19:28:09 +08:00
daiao 79d2aadf93 评测结果分类 2017-09-07 15:03:12 +08:00
daiao c877f40ccd 评测代码错误分类 2017-09-07 14:36:25 +08:00
daiao 0b1f6f5378 实训TPI代码评测修改为代码抛异常和代码实际输出与测试集输出不匹配2种类型 2017-09-07 14:22:12 +08:00
huang bb170d810d 重新评测通关显示问题 2017-09-06 17:53:13 +08:00
huang 2d5b255d52 评测数据显示问题 2017-09-06 16:33:09 +08:00
huang b18d9a5e51 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-06 16:24:36 +08:00
huang 29ad462f17 解决评测信息有误解及评测结果不明确问题 2017-09-06 16:23:19 +08:00
cxt cbb6b2175f Merge branch 'dev_xucheng' into develop
Conflicts:
	public/javascripts/edu/edu_tpi.js
	public/stylesheets/css/edu-public.css
2017-09-06 10:52:47 +08:00
cxt a96c8b8489 我的课堂调整 2017-09-06 10:51:34 +08:00
XuCheng642 2a58193e8f Merge branch 'dev_xucheng' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng 2017-09-06 09:35:00 +08:00
XuCheng642 d8974ef184 issue修改 2017-09-06 09:26:19 +08:00
daiao 8d09ea9e24 试用申请被拒绝后的提示语与重新试用申请的控制时间由24小时改为5分钟 2017-09-06 09:14:52 +08:00
daiao 0b729ad2e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:39:16 +08:00
daiao 2daf1d9c24 评测 2017-09-05 17:38:59 +08:00
cxt c16b08c63b 取消学生职业认证中的上传图片 2017-09-05 14:46:19 +08:00
cxt ef3c4f1d51 简化统一实训和课堂的专业及课程名称 2017-09-05 11:03:49 +08:00
huang 21fd3b685a cookie调试 2017-09-04 15:03:14 +08:00
huang 60d5774e5e 退出登录 2017-09-04 14:36:16 +08:00
huang 2a3d97e18c 测试cookie删除 2017-09-04 13:13:35 +08:00
huang d0ee3752b6 测试 2017-09-04 12:58:53 +08:00
huang 1e5e391fa2 退出不了的问题 2017-09-04 12:52:14 +08:00
huang aebe2b7ef6 domain退出不了问题 2017-09-04 11:38:11 +08:00
huang fc362a5f68 无法登陆 2017-09-04 11:22:37 +08:00
huang 8562ab0e2f 解决评测通关数字不明确问题 2017-09-04 10:52:30 +08:00
daiao 871f02a40f 上线缺陷修复 2017-09-03 17:37:29 +08:00
daiao 8e790d700e Merge branch 'dev_xucheng' into develop 2017-09-03 16:41:44 +08:00
XuCheng642 ce440ce6ec 修改 2017-09-03 14:08:44 +08:00
daiao 9fdb104783 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 19:55:26 +08:00
daiao ec9e28a4ad 上线缺陷修复 2017-09-01 19:55:11 +08:00
XuCheng642 ed8a1e4510 Merge branch 'dev_xucheng' into develop
Conflicts:
	app/controllers/managements_controller.rb
	app/views/courses/new.html.erb
	app/views/users/show.html.erb
	config/routes.rb
2017-09-01 19:44:19 +08:00
XuCheng642 bb9fb39396 缺陷修复 2017-09-01 19:37:09 +08:00
daiao 71c34557e5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 19:21:16 +08:00
daiao 888bd440e2 上线缺陷修复 2017-09-01 19:21:00 +08:00
cxt 1775922c5b 试用申请的多次弹框 2017-09-01 19:19:19 +08:00
daiao c3e552fd3c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 18:32:33 +08:00
daiao bd6d6a773c 修复上线缺陷 2017-09-01 18:32:16 +08:00
huang dfcfd9e791 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 17:30:46 +08:00
huang 7b57e04259 解决实训首页显示顺序和搜索顺序不一致的问题 2017-09-01 17:21:53 +08:00
cxt a087cc809a Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/courses/index.html.erb
	app/views/courses/index.js.erb
	app/views/subjects/_subject_list.html.erb
	app/views/subjects/show.html.erb
2017-09-01 15:06:18 +08:00
daiao 04a6108f81 Merge branch 'dev_daiao' into develop 2017-09-01 14:22:28 +08:00
daiao 6ee134b2f3 实训技能标签失去焦点保存 2017-09-01 13:50:22 +08:00
huang 1506ce19dd 发布状态的一些权限控制 2017-09-01 13:20:36 +08:00