Commit Graph

26 Commits

Author SHA1 Message Date
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 bf5416fe4b 添加identifier 2017-04-26 09:39:27 +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
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
chenglong 8e2cce8fd2 静态页面的修改 2017-04-21 20:06:54 +08:00
huang 5bcc22a8cf 修改评测结果结构 2017-04-20 17:19:18 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang b8ba0da2b8 矫正接口数据 2017-04-19 21:48:57 +08:00
huang b06a9de3ac 修改输入位置 2017-04-19 20:16:02 +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
cxt 6b9b1fe013 部门申请的后台审核 2017-04-14 15:36:23 +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 a7dbc3e822 版本库局部刷新;测评提交结果展示;隐藏展示 2017-04-13 13:45:11 +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 36f380da95 添加难易度字段 2017-04-11 10:13:57 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00