Commit Graph

22004 Commits

Author SHA1 Message Date
cxt df83ea5d7f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:58:12 +08:00
cxt 3363e3234a 课堂列表的课程下拉列表 2017-09-08 20:57:56 +08:00
daiao c4f90858f4 缺陷修复 2017-09-08 20:49:25 +08:00
daiao f01fc7a981 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:45:34 +08:00
daiao 04af1c6582 上线缺陷修复 2017-09-08 20:45:18 +08:00
cxt c6a9bf4e10 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:38:11 +08:00
XuCheng642 0dd74a2b6e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:37:09 +08:00
XuCheng642 3041176da9 阴影 2017-09-08 20:31:52 +08:00
cxt f457d87755 实训首页的检索 2017-09-08 20:30:25 +08:00
cxt 1d61815e3d 实训作业的查看 2017-09-08 20:11:49 +08:00
daiao 7aa1e4e6ac Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:23:35 +08:00
daiao 02fcc3e9b0 实训头部按钮居中对齐 2017-09-08 19:23:24 +08:00
XuCheng642 b769ab9fc6 Merge branch 'dev_xucheng' into develop
Conflicts:
	public/stylesheets/css/edu-common.css
2017-09-08 19:20:14 +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
daiao 93ad5e97fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:02:55 +08:00
daiao 9732d958aa 提交评测报88后,上一关无法点击 2017-09-08 19:02:40 +08:00
cxt ef2c147820 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:01:27 +08:00
cxt f9209db7d2 实训路径删除章节后,后面的章节数字没有实时刷新 2017-09-08 18:59:51 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
miss 0e26787d0d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 17:41:26 +08:00
miss 0ba7685bf3 issue修改 2017-09-08 17:41:05 +08:00
cxt f26beb7e18 在线课堂首页的500 2017-09-08 17:21:25 +08:00
cxt d6ae24539b 忘记密码的邮件标题错误 2017-09-08 17:14:08 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
caishi 8e52be3ddc 作业设置页面的边框 2017-09-08 17:03:19 +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
daiao f6f652f64c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:54:58 +08:00
miss 3a874f6cf1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:21 +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
daiao ac6ca93b41 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:52:57 +08:00
miss 5fffcfdc3d 实训tpi页面代码过多时拖拽卡顿。
TPM提示语的修改
我的主页中粉丝板块边框和内容的处理
实训TPM配置页的tab修改
实训TPM各个板块间的距离修改。
班级所有页面背景色的修改及各个板块阴影的增加
实训路径中已发布实训的提示语的修改。
2017-09-08 15:52:50 +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 b79f793c96 去掉日志 2017-09-08 15:48:57 +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
daiao 102808a9eb 实训tpi页面,在命令行点击加载上一次通过的代码后,出现样式上的问题 2017-09-08 14:22:07 +08:00
cxt e610bbcb0b 背景知识的编辑 2017-09-08 13:07:21 +08:00
cxt 189cf154b8 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 13:05:12 +08:00
cxt bfe20231e8 实训作业的评分 2017-09-08 13:04:47 +08:00
daiao e399879d68 实训关卡的评测设置,非隐藏测试集不显示锁icon 2017-09-08 11:25:38 +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