Commit Graph

938 Commits

Author SHA1 Message Date
XuCheng642 d33e79dc86 Merge branch 'develop' into dev_xucheng
Conflicts:
	app/controllers/managements_controller.rb
2017-09-14 19:30:36 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00
huang b208907aeb 用户页面排序问题 2017-09-10 11:26:19 +08:00
huang f09411ef07 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-10 11:09:43 +08:00
huang cdd2fc3deb 管理员界面用户排序问题 2017-09-10 11:09:20 +08:00
daiao 90f4d93e44 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 21:52:12 +08:00
daiao 303eaebda2 我的课堂标签修改 2017-09-08 21:51:57 +08:00
cxt 8a6e2ac0f0 在线课堂的全部课堂数量包含归档的 2017-09-08 21:44:46 +08:00
cxt b2ec209f09 实名认证和职业认证的排序 2017-09-08 21:41:20 +08:00
cxt 3363e3234a 课堂列表的课程下拉列表 2017-09-08 20:57:56 +08:00
cxt f457d87755 实训首页的检索 2017-09-08 20:30:25 +08:00
XuCheng642 c9467bbcb4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/controllers/managements_controller.rb
2017-09-08 19:18:44 +08:00
XuCheng642 a1bc1a4882 超级管理员 2017-09-08 19:13:27 +08:00
XuCheng642 dca722c5dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng
Conflicts:
	app/views/syllabuses/index.html.erb
2017-09-08 19:11:24 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
daiao 19c9e52aa4 测试集抛异常则不特殊处理空格 2017-09-08 16:22:51 +08:00
daiao 6ac212a849 Merge branch 'dev_xucheng' into develop 2017-09-08 15:55:18 +08:00
huang 2b1516558f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:47 +08:00
huang 234a8d7f7d 解决版本库类型更新不成功的问题 2017-09-08 15:53:32 +08:00
cxt a376140d75 Merge branch 'dev_cxt' into develop 2017-09-08 15:50:21 +08:00
huang 159a91878f 解决异常问题 2017-09-08 15:49:48 +08:00
cxt a8cf183944 完成实训作业的自动评分功能 2017-09-08 15:48:35 +08:00
cxt ab9d4b88d3 新建班级中上传资源后点击确定,页面没有刷新 2017-09-08 15:27:13 +08:00
daiao e14382d0b5 我的实训的内容同步个人主页 2017-09-08 15:26:57 +08:00
cxt 90d4a9034a 分班成绩导出报500 2017-09-08 15:06:54 +08:00
huang 9fe9095837 优化开启实训方法;解决实训偶尔被fork多次的问题;解决开启实训的时候版本库为空的问题 2017-09-08 14:53:36 +08:00
cxt bfe20231e8 实训作业的评分 2017-09-08 13:04:47 +08:00
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
cxt e4ed06fab0 Merge branch 'develop' into dev_cxt 2017-09-07 10:34:17 +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 5678fbfccb 在线课堂首页筛选修改 2017-09-06 16:08:56 +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