Commit Graph

54 Commits

Author SHA1 Message Date
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
daiao aa0ed21b8c Merge branch 'dev_daiao' into develop 2017-05-18 14:26:40 +08:00
daiao e0a4a9b1ab TMP新增预备知识页面,新建/配置加入预备知识MD 2017-05-18 11:30:29 +08:00
huang 59fadefc4f 编程作业、普通作业作品显示 2017-05-17 15:22:48 +08:00
huang 6da6840d73 修复game列表链接问题 2017-05-16 10:19:16 +08:00
huang b48d4298bf tpi中game列表排序问题 2017-05-15 17:00:52 +08:00
huang 660f23d0fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-14 15:28:35 +08:00
huang fe350546a9 重新评测的一些修改 2017-05-14 15:28:18 +08:00
cxt cd977bad3a Merge branch 'dev_cxt' into develop
Conflicts:
	public/stylesheets/css/edu-common.css
	public/stylesheets/css/taskstyle.css
2017-05-13 22:26:14 +08:00
cxt 0e868b45d7 班级新建和设置(除模块设置) 2017-05-13 22:23:53 +08:00
huang 2d0a2f8a89 提供一直可以评测功能 2017-05-10 10:43:23 +08:00
huang 77025d0ae1 实训添加重置功能 2017-05-08 15:28:35 +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
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 e06dba1879 测试集通过的时候显示对勾,ajax加载图片无法显示问题 2017-05-05 17:23:21 +08:00
huang ea0d90a383 实训积分系统 2017-05-04 17:29:00 +08:00
cxt 5e82ef00ba 身份认证 2017-05-04 14:33:50 +08:00
daiao 660e29fe3d tpm列表 2017-05-03 17:46:59 +08:00
huang ec22329e5f 完善资料积分、积分不重复计算 2017-05-03 16:51:26 +08:00
huang 1aee70dc02 完成用户注册积分奖励 2017-05-03 15:23:01 +08:00
cxt e810d93491 课程资源库 2017-05-03 10:10:27 +08:00
huang c477b634cb 实训统计列表 2017-05-02 17:18:34 +08:00
cxt 0188d09454 Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/layouts/new_base.html.erb
	public/stylesheets/css/edu-public.css
2017-04-28 22:55:45 +08:00
cxt 60d33cf661 课程首页(除课程资源库和课程题库) 2017-04-28 22:53:34 +08:00
huang 5da2a7ee59 查看关卡权限修改 2017-04-28 10:21:02 +08:00
cxt e079bfaa6c Merge branch 'dev_huang' into dev_cxt 2017-04-27 16:13:07 +08:00
cxt a69ba56711 基本资料的修改 2017-04-27 15:53:13 +08:00
huang 18543c87ca 实训首页添加reduce排序 2017-04-27 10:18:15 +08:00
huang 4d30251bf3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 14:20:26 +08:00
huang b3c803341f url重定义 2017-04-26 14:20:07 +08:00
daiao 2f14a2e6ca Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 11:10:20 +08:00
daiao fe9ebbb6d6 实训首页的热度排序与时间排序 2017-04-26 11:10:01 +08:00
huang c98d8cdf1d myshixun中id转换 2017-04-26 10:19:04 +08:00
huang bf5416fe4b 添加identifier 2017-04-26 09:39:27 +08:00
huang 2218a63710 shixun整型ID转换成8位字符串 2017-04-25 17:15:37 +08:00
huang 4cc972d3fe admin提供实训认证 2017-04-24 17:29:38 +08:00
cxt 9e7624f90a Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/css/bigdata-common.css
2017-04-21 22:10:17 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
huang 240ee0e2d2 多条任务出错,显示第一个测试集的错误 2017-04-21 14:54:16 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang 0dc5919737 md上传图片不能渲染问题 2017-04-20 11:21:35 +08:00
huang 1a25407a7a 修改版本库获取方式 2017-04-19 16:26:18 +08:00
cxt c49191b70f Merge branch 'develop' into dev_cxt 2017-04-18 10:30:36 +08:00
cxt cf24bf1f75 资源库的数据迁移 2017-04-18 09:03:39 +08:00
huang 67af31b8cc 发布实训接口 2017-04-16 17:20:47 +08:00
huang 50ed200ca4 game纠错消息发送 2017-04-14 14:38:29 +08:00
huang e351834fb1 添加game开启时间,open_time数据迁移。index刷新显示隐藏 2017-04-14 10:58:25 +08:00
huang bbc02752a5 game列表 2017-04-14 10:02:53 +08:00
cxt 95911cd2ae 新版课程相关后台架构的搭建 2017-04-14 09:28:00 +08:00