Commit Graph

114 Commits

Author SHA1 Message Date
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