 daiao
|
55a1367b8a
|
新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了
|
2017-08-22 16:11:56 +08:00 |
|
daiao
|
8037d443bc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_repository.html.erb
|
2017-08-22 15:32:15 +08:00 |
|
daiao
|
cec7ca68e9
|
Merge branch 'dev_daiao' into develop
|
2017-08-22 15:29:36 +08:00 |
|
daiao
|
c79aa9f114
|
webssh修改到中间层
|
2017-08-22 15:29:10 +08:00 |
 miss
|
17fb368ff8
|
评论区向左缩进时，输入框和发送点赞按钮重叠在一起问题的解决
|
2017-08-22 15:14:14 +08:00 |
|
miss
|
720b138631
|
平台tip的进一步优化，解决加载之后的tip事件不执行
|
2017-08-22 14:17:47 +08:00 |
|
miss
|
ba3938a86a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-22 10:21:53 +08:00 |
|
miss
|
78c5b28227
|
IE浏览器webssh多个tabde的高度问题
|
2017-08-22 10:21:05 +08:00 |
 huang
|
93c6046b40
|
实训控制器中常量整理
|
2017-08-22 09:20:25 +08:00 |
|
daiao
|
3811438d29
|
实训tpi页面，在命令行页面进行重新加载代码会导致代码页面部分色差
|
2017-08-21 16:52:42 +08:00 |
|
huang
|
ccc77ef427
|
添加机器学习镜像已经跳过gitlab hook登录验证
|
2017-08-21 15:50:18 +08:00 |
|
daiao
|
4cc2a7688e
|
新建实训时插入图片的弹框有问题了
|
2017-08-21 15:41:03 +08:00 |
|
huang
|
ffa69491bc
|
gitlab hook测试
|
2017-08-21 14:56:15 +08:00 |
|
huang
|
78c5559c2d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-21 14:41:47 +08:00 |
|
huang
|
859c6f99d3
|
测试gitlab hoook效果
|
2017-08-21 14:41:33 +08:00 |
|
miss
|
daf430b7d6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-21 14:37:20 +08:00 |
|
miss
|
c556eeddb4
|
wessh有个多个tab时，从中间开始关闭，会导致页面致黑，没有显示的问题的解决
|
2017-08-21 14:36:29 +08:00 |
|
daiao
|
32cc7edba6
|
Merge branch 'develop' into dev_daiao
|
2017-08-21 14:06:32 +08:00 |
|
daiao
|
8c1e5b9ff8
|
学员实训页面中，编辑器中的括号不会匹配到对应的括号，需要加高亮
|
2017-08-21 14:06:10 +08:00 |
|
daiao
|
303ad2f647
|
TPM的版本库的代码文件在编辑时，js效果有问题
|
2017-08-20 16:32:14 +08:00 |
|
miss
|
c24374393b
|
tip样式层级的修改
|
2017-08-20 09:57:15 +08:00 |
|
daiao
|
08ea5a603c
|
webssh加号后不对
|
2017-08-18 21:01:42 +08:00 |
|
daiao
|
9409decd96
|
加载上次通过的代码去除原来加载效果
|
2017-08-18 20:46:11 +08:00 |
|
daiao
|
e76d058149
|
载入中样式调整
|
2017-08-18 20:26:32 +08:00 |
|
daiao
|
c7fa9ca594
|
webssh的窗口
|
2017-08-18 19:54:47 +08:00 |
|
daiao
|
6fc9619d92
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 19:34:08 +08:00 |
 XuCheng642
|
3add6a073b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 19:32:05 +08:00 |
|
daiao
|
57e37ee330
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 19:30:58 +08:00 |
|
daiao
|
fc864a4a86
|
修改版本库路径
|
2017-08-18 19:30:43 +08:00 |
|
miss
|
3fe28670c7
|
tab加减的修改
|
2017-08-18 19:27:16 +08:00 |
|
miss
|
e86bfedaa0
|
过关后，点击下一关还原效果
|
2017-08-18 18:41:21 +08:00 |
|
miss
|
b708e2f0cc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_repository.html.erb
|
2017-08-18 18:38:50 +08:00 |
|
miss
|
ddb7602a90
|
tab修改
|
2017-08-18 18:36:54 +08:00 |
 cxt
|
3476f46a8a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 18:19:01 +08:00 |
|
cxt
|
39aa3eb257
|
tpi修改
|
2017-08-18 18:17:44 +08:00 |
|
XuCheng642
|
f4808de686
|
超级管理员页面部门删除
|
2017-08-18 17:57:08 +08:00 |
 caishi
|
b6e1f65d63
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 16:45:11 +08:00 |
|
caishi
|
268de03f8b
|
TPM任务显示顺序
|
2017-08-18 16:44:46 +08:00 |
|
cxt
|
64da318f51
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 16:34:05 +08:00 |
|
XuCheng642
|
f5ed3d7da8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 16:25:54 +08:00 |
|
XuCheng642
|
47193aebf6
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 16:25:23 +08:00 |
|
huang
|
66a2fdc174
|
测试
|
2017-08-18 16:25:09 +08:00 |
|
cxt
|
b18ddc73ab
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 16:24:59 +08:00 |
|
caishi
|
8df293cfcd
|
Merge branch 'dev_cs' into develop
|
2017-08-18 16:23:00 +08:00 |
|
caishi
|
a5124c9952
|
TPI加载效果
|
2017-08-18 16:21:32 +08:00 |
|
XuCheng642
|
208c21f761
|
超级管理员页面部门修改
|
2017-08-18 16:15:32 +08:00 |
|
daiao
|
45ac04aa36
|
版本库路径刷新
|
2017-08-18 16:08:32 +08:00 |
|
cxt
|
7fbaa66e88
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_code_actions.html.erb
|
2017-08-18 15:57:16 +08:00 |
|
cxt
|
d71c7a72c8
|
点击评测时“下一关”有加载样式
|
2017-08-18 15:54:52 +08:00 |
|
caishi
|
ab5b9ec5c3
|
Merge branch 'dev_cs' into develop
|
2017-08-18 15:40:50 +08:00 |