Commit Graph

272 Commits

Author SHA1 Message Date
huang 30507006eb 解决中文乱码 2017-04-27 17:34:12 +08:00
huang 6d5ecdf70c 解决首页无法退出登录的问题 2017-04-27 17:05:39 +08:00
daiao 61b46f4aad codeMirror高度,更新实训json字段 2017-04-27 16:24:29 +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 01a6f9f894 发布修改可运行文件参数 2017-04-27 14:33:09 +08:00
huang 18543c87ca 实训首页添加reduce排序 2017-04-27 10:18:15 +08:00
huang 61e7ccb4de shixun 排序 2017-04-26 18:03:48 +08:00
huang 2d87bfb2ae 实训的一些修改 2017-04-26 17:01:25 +08:00
huang 651e02b5cb 开始实训初始化identifier 2017-04-26 16:03:05 +08:00
huang 0ccd6c0d6b 添加重新开启功能及弹框 2017-04-26 15:37:32 +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
daiao 94b7a89e7b Merge branch 'develop' into dev_huang
Conflicts:
	app/views/challenges/_content_list.html.erb
	app/views/shixuns/index.html.erb
2017-04-26 09:48:13 +08:00
huang 2218a63710 shixun整型ID转换成8位字符串 2017-04-25 17:15:37 +08:00
daiao 476a69d38b 实训列表认证操作 2017-04-25 16:27:34 +08:00
huang fd87038ebc 完成实训个人主页 2017-04-25 14:18:52 +08:00
daiao 3d344ee502 实训点击全部任务右侧弹出,用鼠标点击旁边其他区域,弹出去自动收缩,去除点击全部任务的载入中,减少后台访问 2017-04-25 10:11:41 +08:00
huang 4cc972d3fe admin提供实训认证 2017-04-24 17:29:38 +08:00
huang f5ef9206b5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/taskstyle.css
2017-04-24 14:47:55 +08:00
huang 544ec0fb8f 实训首页框架 2017-04-24 14:42:54 +08:00
huang c587f7c25e 重复跳转问题 2017-04-21 22:45:36 +08:00
huang 79d7681dd4 跟新chalnenge保存脚本 2017-04-21 22:42:30 +08:00
huang 9f1802b443 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-21 22:20:59 +08:00
huang eaf6cfae47 编辑challenge的时候更新脚本 2017-04-21 22:17:24 +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 f653d694d6 安全设置 2017-04-21 22:03:51 +08:00
huang f061f1408a 关卡时间封装 2017-04-21 21:25:12 +08:00
huang affaa2c4bb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-21 21:16:37 +08:00
huang 7ff019d906 耗时修改 2017-04-21 21:16:19 +08:00
daiao bb8deb87ac 打开jenkins 2017-04-21 21:04:20 +08:00
daiao 25b6e7b562 耗时 2017-04-21 20:53:20 +08:00
huang 895bb129f2 耗时 2017-04-21 20:46:24 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
huang f72296690f 第一次初始化库文件展开 2017-04-21 20:21:52 +08:00
huang d7b3b6ab01 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-21 19:35:17 +08:00
huang 6674e0931d 版本库第一次偶尔不显示问题 2017-04-21 19:34:57 +08:00
daiao 663b165383 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-21 16:58:31 +08:00
daiao 6afbed40d8 codemirror 每10秒保存一次;TIP样式调整 2017-04-21 16:57:59 +08:00
huang 354c7dcffe 0 2017-04-21 16:47:02 +08:00
huang 1806a25d39 添加日志定位问题 2017-04-21 16:46:32 +08:00
huang 8376677b8f 添加日志定位问题 2017-04-21 16:10:46 +08:00
huang 95b8d3d234 修改game访问权限 2017-04-21 15:57:08 +08:00
huang 240ee0e2d2 多条任务出错,显示第一个测试集的错误 2017-04-21 14:54:16 +08:00
huang 24167e6724 返回数据处理修改 2017-04-21 11:01:57 +08:00
huang 8c4331f1ae 添加一些日志 2017-04-21 10:45:18 +08:00
huang 09f7405241 game 取消注释 2017-04-21 09:39:23 +08:00
huang 4ce4ef7252 修复版本库显示问题 2017-04-21 09:25:52 +08:00
huang 5bcc22a8cf 修改评测结果结构 2017-04-20 17:19:18 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang 772631d129 game_status数据json 2017-04-20 15:21:59 +08:00
huang f61bc9d58a 前后端分离数据格式整理 2017-04-20 15:12:33 +08:00
huang e1802f58c6 版本库显示代码简化 2017-04-20 14:10:59 +08:00
daiao f2b5e401f5 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-20 11:24:45 +08:00
daiao 31b998df61 cdnjs加载过慢 2017-04-20 11:22:30 +08:00
huang 0dc5919737 md上传图片不能渲染问题 2017-04-20 11:21:35 +08:00
huang 4f22da1cbb 去掉日志 2017-04-20 10:19:08 +08:00
huang b3245aca44 修改日志 2017-04-20 10:05:43 +08:00
huang a045a57173 添加日志跟踪问题 2017-04-20 09:47:56 +08:00
huang 0593141a3b 解决实际输出问题 2017-04-19 22:08:25 +08:00
huang b8ba0da2b8 矫正接口数据 2017-04-19 21:48:57 +08:00
huang 07031ea8bc 取消注释 2017-04-19 20:45:13 +08:00
huang b06a9de3ac 修改输入位置 2017-04-19 20:16:02 +08:00
huang 43e6a53244 局部刷新问题 2017-04-19 19:27:17 +08:00
huang e56e81da93 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-19 16:26:33 +08:00
huang 1a25407a7a 修改版本库获取方式 2017-04-19 16:26:18 +08:00
daiao 465019825f 网页一直请求数据报错,及其TPI样式调整 2017-04-19 16:24:44 +08:00
huang fd8c4d8e12 gilab修正 2017-04-19 15:08:04 +08:00
huang a9e5a27170 发布实训参数修改 2017-04-19 14:18:36 +08:00
huang de8fa4e831 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/challenges/_form.html.erb
2017-04-19 13:54:35 +08:00
huang 6520faefa0 一些改动 2017-04-19 11:31:52 +08:00
daiao c42960bbad tpi界面调整 2017-04-19 10:37:32 +08:00
huang 9cd328f224 status问题 2017-04-18 23:10:33 +08:00
huang e66512bcd2 测试及为空处理 2017-04-18 23:04:33 +08:00
huang 38c0107a93 添加详细日志 2017-04-18 21:29:02 +08:00
huang 6b373e5d7c 添加日志 2017-04-18 21:12:52 +08:00
huang 2f294de330 点击“下一步”局部刷新 2017-04-18 20:26:41 +08:00
huang cfc3e45264 没评测前不显示测试比例 2017-04-18 19:56:20 +08:00
huang c43f1babe6 提交评测数据传输 2017-04-18 18:08:42 +08:00
huang c90dd2e82b 评测结果处理 2017-04-18 17:55:15 +08:00
huang a1506c7e28 gameshow显示 2017-04-18 16:14:11 +08:00
huang ea06c30fd3 提交评测返回结果 2017-04-18 14:09:08 +08:00
huang 2907d556ae game_build前后端分离 2017-04-18 10:49:52 +08:00
cxt c49191b70f Merge branch 'develop' into dev_cxt 2017-04-18 10:30:36 +08:00
huang 8f53cb5130 提交评测返回数据处理 2017-04-18 10:22:28 +08:00
huang 4a950dbdfb 开启实训异常处理及跳转更新 2017-04-17 16:30:37 +08:00
huang f6998fb6ab 实训发布增加权限控制 2017-04-17 15:39:01 +08:00
huang 4c5b92cf88 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 15:30:51 +08:00
huang 3f9498c6f7 实训发布异常处理 2017-04-17 15:30:31 +08:00
daiao b65b58a595 TPM的编辑模式的锁定 2017-04-17 15:16:42 +08:00
huang 5b0982f358 新建challenge异常处理及公开私有调整 2017-04-17 14:57:20 +08:00
huang c05964be61 challenge编辑功能 2017-04-17 14:41:23 +08:00
huang a0c88d755c 编辑模式 2017-04-17 14:37:39 +08:00
huang 9328c771b0 challenge show页面数据调整 2017-04-17 10:11:17 +08:00
huang 67af31b8cc 发布实训接口 2017-04-16 17:20:47 +08:00
huang 62b579df71 game结果列表实时刷新 2017-04-16 10:16:36 +08:00
huang 628a7a43fd Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 16:13:09 +08:00
huang 99de376266 game测试集结果 2017-04-14 16:12:54 +08:00
daiao d919bf65d6 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 15:47:46 +08:00
daiao 080d00ab04 点赞与踩功能 2017-04-14 15:47:20 +08:00
cxt 6b9b1fe013 部门申请的后台审核 2017-04-14 15:36:23 +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
cxt 95911cd2ae 新版课程相关后台架构的搭建 2017-04-14 09:28:00 +08:00
huang 698d9f54d5 TPM纠错 2017-04-14 08:39:09 +08:00
daiao ed9e4f571a 实训纠错弹框 2017-04-13 16:29:15 +08:00
huang c0f0c8b694 局部刷新 2017-04-13 14:29:33 +08:00
huang 06c6817778 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-13 13:45:31 +08:00
huang a7dbc3e822 版本库局部刷新;测评提交结果展示;隐藏展示 2017-04-13 13:45:11 +08:00
daiao fc546e4fd2 实训TPM样式调整 2017-04-13 10:58:34 +08:00
guange 5c0bb0f870 markdown图片上传 2017-04-12 21:55:33 +08:00
huang 1f412f8dab TPM样式引入调整 2017-04-12 17:25:47 +08:00
huang 81be008780 发布实训功能及异常处理、权限处理 2017-04-12 16:06:03 +08:00
huang 927898ebda shixun配置中去掉添加脚本功能 2017-04-12 14:03:20 +08:00
huang 55972fdbe6 新建实训 --事务一致性及异常处理 2017-04-12 13:36:13 +08:00
huang ba0f5976f0 challenge保存的时候向jenkins发送请求,生成pipeline片段 2017-04-12 10:35:22 +08:00
cxt 7b977e9fcc 基本资料相关后台开发 2017-04-11 16:19:35 +08:00
huang 7a59b013a0 实训开启接口修改,显示权限控制 2017-04-11 11:09:06 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00