 miss
|
9e3f46dc36
|
body的高度不足100%的问题以及无滚动内容出现滚动条的问题
|
2017-08-27 16:50:34 +08:00 |
|
miss
|
f3926dbdd2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 15:22:23 +08:00 |
|
miss
|
f458952d60
|
个人主页的悬浮效果错位
|
2017-08-27 15:21:57 +08:00 |
 huang
|
27011b06bc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 11:47:07 +08:00 |
|
huang
|
0076291c9d
|
样式问题
|
2017-08-27 11:46:55 +08:00 |
 daiao
|
e81e8d3911
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 11:18:33 +08:00 |
|
daiao
|
7e03296bea
|
管理员只看支撑实训
|
2017-08-27 11:18:18 +08:00 |
 caishi
|
b1885427b6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 10:56:03 +08:00 |
|
huang
|
f6240f7d59
|
新建作业的时候填入列表页面
|
2017-08-27 10:55:46 +08:00 |
|
caishi
|
1fb2f6e398
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 10:35:35 +08:00 |
|
caishi
|
d2915df759
|
作业详情和作业列表tab
|
2017-08-27 10:34:10 +08:00 |
 cxt
|
ebd34af0a3
|
绑定邮箱
|
2017-08-25 21:51:47 +08:00 |
|
cxt
|
eab9071d4d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 21:49:38 +08:00 |
|
caishi
|
55d8fa7f13
|
Merge branch 'dev_cs' into develop
|
2017-08-25 21:40:01 +08:00 |
|
caishi
|
0f3c884f0a
|
课程实训点击事件
|
2017-08-25 21:38:07 +08:00 |
|
caishi
|
e60329fc97
|
Merge branch 'develop' into dev_cs
|
2017-08-25 21:26:06 +08:00 |
|
cxt
|
f93aff3ed0
|
Merge branch 'dev_cs' into develop
|
2017-08-25 21:23:10 +08:00 |
|
caishi
|
c4ac37cc4d
|
双点击事件
|
2017-08-25 21:19:20 +08:00 |
|
cxt
|
cf691558d9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 21:07:06 +08:00 |
|
cxt
|
463b232a68
|
首页的新建实训
|
2017-08-25 21:06:51 +08:00 |
|
huang
|
0ddfa360af
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:48:31 +08:00 |
|
miss
|
78f50d70ca
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:46:10 +08:00 |
|
miss
|
c234125ee5
|
主页tip样式修改。版本库及评测区域图标变换
|
2017-08-25 20:45:44 +08:00 |
|
huang
|
dd37e049d2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:27:35 +08:00 |
|
caishi
|
74c9039f89
|
Merge branch 'dev_cs' into develop
|
2017-08-25 20:27:34 +08:00 |
|
huang
|
6a5a3024ec
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 20:27:12 +08:00 |
|
caishi
|
833a40a68a
|
课程实训里开始实战权限问题
|
2017-08-25 20:25:53 +08:00 |
|
cxt
|
07b2c0319e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:21:02 +08:00 |
|
cxt
|
94a4bd8001
|
镜像管理的调整
|
2017-08-25 20:19:32 +08:00 |
|
daiao
|
efab84a950
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 19:56:33 +08:00 |
|
daiao
|
ef0da2ebf6
|
修改上传附件删除按钮的位置
|
2017-08-25 19:56:17 +08:00 |
 XuCheng642
|
a3ec46c820
|
迁移
|
2017-08-25 19:54:05 +08:00 |
|
huang
|
7ebb8d63b0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 19:40:23 +08:00 |
|
huang
|
86000572f6
|
实训直接在命令中编辑的话让实训产生重置
|
2017-08-25 19:40:05 +08:00 |
|
caishi
|
b4dfffce1e
|
版本库tip信息修改
实训课程里面对应的实训状态显示
|
2017-08-25 19:12:16 +08:00 |
|
miss
|
e1407a6834
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 18:31:20 +08:00 |
|
miss
|
381a62bd2c
|
实训套件的翻页器距离问题
|
2017-08-25 18:30:03 +08:00 |
|
huang
|
75ddc4b64e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 17:36:44 +08:00 |
|
huang
|
f2453a54ac
|
Merge branch 'dev_cs' into develop
|
2017-08-25 17:36:30 +08:00 |
|
caishi
|
2aaa365f83
|
实训课程的遮罩层以及已发布的状态提示
|
2017-08-25 17:34:31 +08:00 |
|
miss
|
6aa98c675c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 17:33:34 +08:00 |
|
miss
|
0cef7e2349
|
解决实训套件的套件数目不到两排而造成的翻页器离底部距离太远的问题
|
2017-08-25 17:33:07 +08:00 |
|
XuCheng642
|
6d8f94a452
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 17:32:53 +08:00 |
|
XuCheng642
|
a35df4e5e1
|
专业列表
|
2017-08-25 17:32:15 +08:00 |
|
huang
|
6ccb58b863
|
测试版webssh和中间层post请求区分开（http和域名问题）
|
2017-08-25 17:22:53 +08:00 |
|
caishi
|
3ddfd6cc24
|
Merge branch 'develop' into dev_cs
|
2017-08-25 17:05:25 +08:00 |
|
caishi
|
03a7b645b8
|
issues修改
|
2017-08-25 17:03:18 +08:00 |
|
huang
|
57722df834
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/shixuns/_form.html.erb
|
2017-08-25 16:37:05 +08:00 |
|
huang
|
058f36c47c
|
Merge branch 'dev_huang' into develop
|
2017-08-25 16:35:51 +08:00 |
|
XuCheng642
|
d0181f80b7
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 16:25:12 +08:00 |