Commit Graph

19817 Commits

Author SHA1 Message Date
daiao 8ab53dd0b5 顶部导航栏的搜索框,请拉宽一点,保证提示文字显示全 2017-05-10 09:47:48 +08:00
daiao 5f0df57f9e 实训首页的导师姓名栏请调整为自适应宽度,栏目整体居中,而不是固定宽度 2017-05-10 09:45:18 +08:00
daiao 7295357413 平台背景色请更换成讨论定下的淡灰色 2017-05-10 09:22:29 +08:00
daiao d99d364f92 重置TPI代码 2017-05-09 15:44:25 +08:00
Linda 69ab43afc6 实训banner图片整体缩放显示不完整问题 2017-05-08 17:23:51 +08:00
Linda 0a1ce15b32 未登录首页banner全屏缩放显示背景空白解决 2017-05-08 17:16:21 +08:00
daiao 1213c790d8 删除调试代码 2017-05-08 16:51:36 +08:00
daiao 7f6dbecf27 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 16:45:07 +08:00
daiao be9d28f6fd 评测机制修改 2017-05-08 16:44:51 +08:00
huang e7e79b42fd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 16:36:27 +08:00
huang 5ea6c193f6 允许实训创建者参加挑战 2017-05-08 16:36:08 +08:00
huang 999ecff445 新建实训的时候自动新建版本库 2017-05-08 16:35:29 +08:00
cxt c34f526f63 Merge branch 'develop' into dev_cxt 2017-05-08 16:29:20 +08:00
daiao 6aa3384504 编辑关卡时,显示当前关卡是第几关 2017-05-08 15:36:33 +08:00
huang 3d6098251e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 15:28:57 +08:00
huang 77025d0ae1 实训添加重置功能 2017-05-08 15:28:35 +08:00
daiao 01d2400a1c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 15:28:34 +08:00
daiao 2f7cd60867 tpi测试集显示效果跟后台一致 2017-05-08 15:28:18 +08:00
cxt 98363d6c92 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 15:26:30 +08:00
cxt 9e04ed6a2d 课程的资源和题库选用到班级 2017-05-08 15:26:16 +08:00
Linda e5e87815f6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 15:16:24 +08:00
Linda e7a0888857 分组作业题库静态页面 2017-05-08 15:14:17 +08:00
cxt ff587da397 基本资料页的bug修复 2017-05-08 14:52:10 +08:00
daiao b25bf8abb3 测试集多行内容时,样式不正确 2017-05-08 14:35:33 +08:00
daiao d1ed52382d 实训头部样式调整 + 版本库codemirror的出现2个滚动条 2017-05-08 14:02:26 +08:00
miss b6a04a0785 班级页面 2017-05-08 13:53:28 +08:00
huang 7a826e3461 样式调整 2017-05-05 22:50:23 +08:00
huang bc12eb9ac7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-05 22:38:10 +08:00
huang 77900caac1 样式调整 2017-05-05 22:37:58 +08:00
cxt d23be7777d 课程题库发送到班级 2017-05-05 22:09:48 +08:00
Your Name cb05102d68 Merge branch 'old-master' into develop 2017-05-05 21:48:31 +08:00
cxt 67499b9ce2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-05 21:10:04 +08:00
cxt 0319ff96fa 保存基本资料报500 2017-05-05 21:09:46 +08:00
huang da19d8a7fd 添加日志 2017-05-05 20:57:18 +08:00
cxt 66640b5a14 Merge branch 'dev_cxt' into develop
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/base_edu.html.erb
	app/views/layouts/login_bigdata.html.erb
	public/stylesheets/css/edu-common.css
2017-05-05 20:21:15 +08:00
daiao 990b0a250c 修复上线bug 2017-05-05 20:14:26 +08:00
cxt f2a0287d09 新建课程的标签-“智能课堂” 2017-05-05 19:48:36 +08:00
cxt 239178e4e1 去掉个人首页的“编辑我的资料”、隐藏“博客” 2017-05-05 19:45:33 +08:00
cxt 3fdec893c9 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/layouts/base_edu.html.erb
	public/stylesheets/css/edu-public.css
2017-05-05 19:37:29 +08:00
cxt 6fe571cc99 课程资源库和课程题库 2017-05-05 19:36:32 +08:00
huang 44e309dcc0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-05 17:23:36 +08:00
huang e06dba1879 测试集通过的时候显示对勾,ajax加载图片无法显示问题 2017-05-05 17:23:21 +08:00
daiao d39f9deac3 实训tpi代码优化 2017-05-05 17:22:50 +08:00
daiao 97400db898 实训时间更新 2017-05-05 17:12:04 +08:00
huang 9d2907551b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-05 16:38:26 +08:00
huang aa080318ee Merge branch 'dev_huang' into develop 2017-05-05 16:38:10 +08:00
huang ead40dda01 ajax加载效果 2017-05-05 16:37:48 +08:00
daiao 69125fa9c4 baiduTemplate在JS文件中报错 2017-05-05 16:33:13 +08:00
huang 7f70bad8f1 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-05-05 16:14:50 +08:00
huang 6e52d9128b 评测显示结果更正。代码重构 2017-05-05 16:14:35 +08:00