 daiao
|
cbd91be0d0
|
实训耗时
|
2017-04-28 16:01:38 +08:00 |
|
daiao
|
1f068baee0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 15:16:45 +08:00 |
|
daiao
|
1ea4f8ce29
|
新建实训多个editorMD输入时，默认输入第二个
|
2017-04-28 15:16:22 +08:00 |
 huang
|
8588fbacf3
|
总得分统计
|
2017-04-28 15:11:11 +08:00 |
|
daiao
|
62c301d5e2
|
实训参考答案显示与编辑使用editorMD
|
2017-04-28 14:47:18 +08:00 |
|
daiao
|
456b348329
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 11:25:41 +08:00 |
|
daiao
|
62473d7fae
|
实训样式调整
|
2017-04-28 11:25:21 +08:00 |
|
huang
|
351da6d9cd
|
boolean类型转换成0/1
|
2017-04-28 10:24:40 +08:00 |
|
huang
|
7fb67fd8bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 10:21:27 +08:00 |
|
huang
|
5da2a7ee59
|
查看关卡权限修改
|
2017-04-28 10:21:02 +08:00 |
 Linda
|
fdf72d982a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 10:12:30 +08:00 |
|
Linda
|
d7c05853ff
|
导航点击头像悬浮显示效果延迟
导航搜索框下拉火狐浏览器超边距修改
|
2017-04-28 10:11:29 +08:00 |
|
daiao
|
849d00f068
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 09:51:40 +08:00 |
|
daiao
|
02547f54fa
|
耗时显示不是实时更新的，只有点击评测按钮后耗时统计才会发生改变
|
2017-04-28 09:51:18 +08:00 |
|
huang
|
293c92c594
|
处理jenkins中间层返回错误信息中带 “+” 问题
|
2017-04-28 09:13:43 +08:00 |
|
huang
|
30507006eb
|
解决中文乱码
|
2017-04-27 17:34:12 +08:00 |
|
huang
|
6d5ecdf70c
|
解决首页无法退出登录的问题
|
2017-04-27 17:05:39 +08:00 |
|
huang
|
4d7f192a44
|
区分登录状态和没登陆状态导航栏
|
2017-04-27 16:40:00 +08:00 |
|
huang
|
b9ddfec8d2
|
游戏实训改成项目实训
|
2017-04-27 16:29:26 +08:00 |
|
huang
|
a61d0750ae
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2017-04-27 16:26:03 +08:00 |
|
daiao
|
61b46f4aad
|
codeMirror高度，更新实训json字段
|
2017-04-27 16:24:29 +08:00 |
|
daiao
|
b039bbeb52
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-27 14:37:25 +08:00 |
|
daiao
|
b184f927f1
|
退出实训到实训主页
|
2017-04-27 14:36:48 +08:00 |
|
huang
|
d5ea4ea4de
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-27 14:33:38 +08:00 |
|
huang
|
01a6f9f894
|
发布修改可运行文件参数
|
2017-04-27 14:33:09 +08:00 |
|
daiao
|
25648fdfbf
|
意见反馈成功后，给出提示
|
2017-04-27 14:27:25 +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
|
a17a1f8910
|
添加执行文件选项
|
2017-04-27 11:21:47 +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
|
00daf38d76
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 16:03:21 +08:00 |
|
huang
|
651e02b5cb
|
开始实训初始化identifier
|
2017-04-26 16:03:05 +08:00 |
|
daiao
|
ec2e2461b8
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 15:50:39 +08:00 |
|
daiao
|
9688df346b
|
实训TMP，技能与知识点点击添加时，自动清空上次的输入的记录，并聚焦
|
2017-04-26 15:50:22 +08:00 |
|
huang
|
0ccd6c0d6b
|
添加重新开启功能及弹框
|
2017-04-26 15:37:32 +08:00 |
|
daiao
|
a1684e1392
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 15:20:52 +08:00 |
|
daiao
|
33c701490e
|
当在代码框的底部编写代码时，回车换行后代码框没有自动下移，必须手动滚动才能使当前正在输入代码所在行回到视线
|
2017-04-26 15:20:32 +08:00 |
|
huang
|
42eb8506c6
|
shixun编辑中添加sql类型
|
2017-04-26 15:02:12 +08:00 |
|
Linda
|
34e3f2e2db
|
Merge branch 'dev_linda' into develop
|
2017-04-26 14:41:20 +08:00 |
|
Linda
|
09571eaea0
|
导航“有问有答”改为“论坛”
|
2017-04-26 14:39:34 +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
|
02d5287449
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 09:49:33 +08:00 |
|
huang
|
a29b8d7761
|
顶部导航添加实训游戏入口
|
2017-04-26 09:49:16 +08:00 |