Commit Graph

66 Commits

Author SHA1 Message Date
huang 48559195f9 评测失败添加等级提示 2017-05-23 21:26:42 +08:00
daiao e4c687fa80 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:55:25 +08:00
daiao 25796ec87e 实训editorMD加入公式编辑显示 2017-05-23 20:55:06 +08:00
huang 15b86ea78a 发布实训错误提示等级封装 2017-05-23 20:53:27 +08:00
huang 18f55234f7 实训开启成功弹框样式及提示信息修改 2017-05-23 20:44:57 +08:00
Linda b522988329 实训项目的首页头部,请调整按钮位置 2017-05-23 15:24:40 +08:00
Linda 63382736b1 TPM点击任务列表的提示弹框没有使用公共样式 2017-05-23 11:06:17 +08:00
huang 903525ded6 实训添加JDBC类型 2017-05-22 16:36:15 +08:00
huang ae10991ae6 合作者权限控制 2017-05-19 17:30:30 +08:00
huang 7ad005d28e 合作者提供删除功能 2017-05-19 17:14:15 +08:00
huang 287ddf7115 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:56:31 +08:00
huang f88bf9bcdb 实训添加合作者功能 2017-05-19 16:56:09 +08:00
Linda 87ceaca558 实训项目的统计页显示错乱 2017-05-19 15:07:26 +08:00
daiao 1a725fbdea 实训TPM样式调整 2017-05-18 14:09:10 +08:00
daiao e0a4a9b1ab TMP新增预备知识页面,新建/配置加入预备知识MD 2017-05-18 11:30:29 +08:00
daiao cdb7484849 TPM的简介与设置页面的简介更换成Md 2017-05-18 09:49:58 +08:00
daiao 08c4c7ee79 实训新建页面 2017-05-17 17:19:16 +08:00
huang 628bad95c2 实训统计相关 2017-05-12 15:12:06 +08:00
huang 365cccef90 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-11 14:43:31 +08:00
huang c2ae3f7b78 完成个人主页 2017-05-11 14:43:12 +08:00
daiao f9766617d2 实训名称显示2行,超出部分以省略号结尾 2017-05-11 10:59:07 +08:00
huang 9a2257d406 shixun统计未完成部分 2017-05-10 12:56:01 +08:00
huang 5ea6c193f6 允许实训创建者参加挑战 2017-05-08 16:36:08 +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 d1ed52382d 实训头部样式调整 + 版本库codemirror的出现2个滚动条 2017-05-08 14:02:26 +08:00
daiao 990b0a250c 修复上线bug 2017-05-05 20:14:26 +08:00
daiao 9bf33e4fe3 查看答案扣除积分功能 2017-05-05 14:57:58 +08:00
huang 6c37495135 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-03 14:14:30 +08:00
daiao c5c0f3eb7c 实训项目列表中,点击某一个实训后,应该在新的浏览器tab中显示 2017-05-03 11:15:33 +08:00
daiao 4431ec6c8f 点击开始挑战后,也是新弹出一个浏览tab 2017-05-03 11:09:00 +08:00
daiao d01c5f75c2 实训按钮样式调整 2017-05-02 17:29:24 +08:00
huang c477b634cb 实训统计列表 2017-05-02 17:18:34 +08:00
daiao 9827af5028 “导师”两个字去掉 2017-05-02 15:29:58 +08:00
Linda 60539680c7 实训首页列表对齐 2017-04-28 17:00:28 +08:00
daiao 61b46f4aad codeMirror高度,更新实训json字段 2017-04-27 16:24:29 +08:00
daiao 6f19ca9f9b 点击“开始挑战”后,进入等待时,要有一个弹框显示“正在加载实训项目,请稍等… …” 2017-04-27 14:03:04 +08:00
daiao 2ff9aea601 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-27 11:25:46 +08:00
daiao 9e3861af90 实训TPM开始挑战,字体调整为14px 2017-04-27 11:25:20 +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 0ccd6c0d6b 添加重新开启功能及弹框 2017-04-26 15:37:32 +08:00
huang 42eb8506c6 shixun编辑中添加sql类型 2017-04-26 15:02:12 +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
daiao d69fcefcf5 实训首页,时间与热度排序 2017-04-26 09:36:10 +08:00
huang 2218a63710 shixun整型ID转换成8位字符串 2017-04-25 17:15:37 +08:00
huang fd87038ebc 完成实训个人主页 2017-04-25 14:18:52 +08:00