 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 |
|
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 |
|
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 |
|
daiao
|
466341eed7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-26 09:36:28 +08:00 |
|
daiao
|
d69fcefcf5
|
实训首页，时间与热度排序
|
2017-04-26 09:36:10 +08:00 |
 Linda
|
b98fa0d0f2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-26 09:05:24 +08:00 |
|
Linda
|
4512508e2c
|
滚动条改方角
|
2017-04-26 09:04:44 +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 |
|
daiao
|
2d187aee51
|
实训的自动保存提示，换成中文
|
2017-04-25 14:31:24 +08:00 |
|
huang
|
fd87038ebc
|
完成实训个人主页
|
2017-04-25 14:18:52 +08:00 |
|
daiao
|
e42b306ee1
|
在任务界面中，不能通过点击关卡直接进入，会提示没有权限
|
2017-04-25 11:20:19 +08:00 |
|
daiao
|
b2c1bd8b43
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-25 10:24:58 +08:00 |
|
daiao
|
dba9b9d156
|
经验值，上下居中
|
2017-04-25 10:24:35 +08:00 |
|
Linda
|
c140c6aa18
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-25 10:20:32 +08:00 |
|
Linda
|
a4057b46ba
|
侧滚动条改为灰色
|
2017-04-25 10:18:48 +08:00 |
|
daiao
|
27f19863a1
|
增加测试集之间的间距
|
2017-04-25 10:14:06 +08:00 |
|
daiao
|
3d344ee502
|
实训点击全部任务右侧弹出，用鼠标点击旁边其他区域，弹出去自动收缩，去除点击全部任务的载入中,减少后台访问
|
2017-04-25 10:11:41 +08:00 |
|
daiao
|
186c29add4
|
用户完成通关后，“测评按钮”变为“退出实训”
|
2017-04-25 09:17:13 +08:00 |
|
daiao
|
3c99fb3d7f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-25 08:57:42 +08:00 |
|
daiao
|
d51deeb949
|
测试结果区域样式调整
|
2017-04-25 08:57:20 +08:00 |
|
huang
|
f51925d786
|
Merge branch 'develop' into dev_huang
|
2017-04-24 17:30:55 +08:00 |
|
huang
|
8a1160add0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-24 17:30:09 +08:00 |
|
huang
|
4cc972d3fe
|
admin提供实训认证
|
2017-04-24 17:29:38 +08:00 |
|
Linda
|
f5531e3af8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-24 17:25:22 +08:00 |
|
Linda
|
9ef4965da1
|
Merge branch 'dev_linda' into develop
|
2017-04-24 17:25:02 +08:00 |
|
Linda
|
9a148a9487
|
实训头部和其他头部样式统一
|
2017-04-24 17:03:44 +08:00 |
|
daiao
|
05ecef5591
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-24 16:59:12 +08:00 |
|
daiao
|
0fb4115753
|
测试信息，三角形应该朝右，点击时，朝下
|
2017-04-24 16:58:45 +08:00 |
|
Linda
|
dacf415b62
|
Merge branch 'develop' into dev_linda
|
2017-04-24 15:37:44 +08:00 |
|
Linda
|
45c6b8286d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-24 15:23:23 +08:00 |
|
huang
|
7675436f7b
|
实训首页调整
|
2017-04-24 15:22:19 +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 |
|
Linda
|
77d5fd1142
|
未登录导航样式修改
|
2017-04-24 13:54:04 +08:00 |