 cxt
|
33c19ff949
|
Merge branch 'dev_xucheng' into develop
|
2017-07-27 10:55:33 +08:00 |
 XuCheng642
|
a348d23889
|
超级管理员的实训课程列表bug修复
|
2017-07-27 10:32:55 +08:00 |
|
cxt
|
e9e4b7177e
|
Merge branch 'dev_xucheng' into develop
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/managements/_shixun_authorization_list.html.erb
|
2017-07-27 09:49:02 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +08:00 |
|
cxt
|
2155c66058
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/users/_my_homepage_courses_list.html.erb
|
2017-07-27 09:00:20 +08:00 |
 caishi
|
5188fb7059
|
个人主页
|
2017-07-26 21:16:45 +08:00 |
|
caishi
|
a211100e34
|
我的主页修改
|
2017-07-26 20:47:22 +08:00 |
|
caishi
|
4618aa6b69
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/users/_my_homepage_shixuns_list.html.erb
|
2017-07-26 20:46:14 +08:00 |
|
caishi
|
443266a5c0
|
导航栏和个人主页样式修改
|
2017-07-26 20:42:15 +08:00 |
 huang
|
0781f11782
|
实训的一些修改
|
2017-07-26 20:41:09 +08:00 |
|
cxt
|
54420bcff9
|
我的课堂的时间调整
|
2017-07-26 20:32:13 +08:00 |
|
cxt
|
c220e83d4b
|
Merge branch 'dev_cs' into develop
|
2017-07-26 20:00:35 +08:00 |
|
cxt
|
3d2a03fe38
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 20:00:24 +08:00 |
|
caishi
|
248ab43b10
|
样式修改
|
2017-07-26 19:59:46 +08:00 |
|
cxt
|
e81bd33dea
|
Merge branch 'dev_cs' into develop
|
2017-07-26 19:41:52 +08:00 |
|
cxt
|
f2da429849
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 19:41:22 +08:00 |
|
caishi
|
709cfb93d5
|
撤销
|
2017-07-26 19:39:04 +08:00 |
|
caishi
|
4330284827
|
1.新建TPM的页面隐藏显示“预备知识”编辑块
2.实训首页隐藏tab整页“预备知识”
|
2017-07-26 19:34:27 +08:00 |
|
cxt
|
4a0d8ab856
|
实训套件的编辑
|
2017-07-26 19:05:46 +08:00 |
|
cxt
|
9374dce56c
|
Merge branch 'dev_cs' into develop
|
2017-07-26 18:57:53 +08:00 |
|
cxt
|
66e2c3d043
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 18:57:41 +08:00 |
|
cxt
|
a48483ef69
|
实训套件的编辑页面
|
2017-07-26 18:57:08 +08:00 |
|
caishi
|
d948f5d0af
|
修改距离
|
2017-07-26 18:56:55 +08:00 |
|
cxt
|
393a80aaa2
|
Merge branch 'dev_cs' into develop
|
2017-07-26 17:42:57 +08:00 |
|
cxt
|
2d7829a2aa
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 17:42:46 +08:00 |
|
cxt
|
306d5ab153
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-26 17:42:12 +08:00 |
|
caishi
|
8705a3c711
|
隐藏不用上线的部分，并修改样式
|
2017-07-26 17:41:11 +08:00 |
|
caishi
|
6cdb77d8a4
|
实训套件编辑样式修改
|
2017-07-26 17:21:02 +08:00 |
|
cxt
|
b4711318d9
|
全部实训首页的筛选条件样式统一
|
2017-07-26 16:53:47 +08:00 |
 miss
|
75d3b92bac
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-26 15:49:38 +08:00 |
|
miss
|
32b4ba9a5f
|
拖拽线的优化
拖拽比例的调整
|
2017-07-26 15:48:09 +08:00 |
|
caishi
|
7522ed948d
|
对应任务的icon
|
2017-07-26 15:47:34 +08:00 |
|
cxt
|
9b5d50445b
|
Merge branch 'dev_cxt' into develop
|
2017-07-26 15:23:57 +08:00 |
|
cxt
|
429642a73d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-26 15:23:46 +08:00 |
|
cxt
|
2bf31a635d
|
Merge branch 'dev_cs' into dev_cxt
|
2017-07-26 15:23:23 +08:00 |
|
cxt
|
182dc3f421
|
实训申请发布
|
2017-07-26 15:15:47 +08:00 |
|
caishi
|
a8ceb7260b
|
编辑套件页面样式修改
|
2017-07-26 15:06:18 +08:00 |
|
cxt
|
faff4c1960
|
Merge branch 'dev_cxt' into dev_cs
|
2017-07-26 14:43:19 +08:00 |
|
cxt
|
0cab42160c
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 14:43:05 +08:00 |
|
caishi
|
fc7b2b5945
|
新建实训关卡入口
|
2017-07-26 14:42:39 +08:00 |
|
cxt
|
f1087cb441
|
实训套件模块的改版
|
2017-07-26 14:42:20 +08:00 |
|
caishi
|
055296bdf4
|
Merge branch 'develop' into dev_cs
|
2017-07-26 14:20:27 +08:00 |
|
caishi
|
c71df99869
|
本关任务添加选择题的显示
|
2017-07-26 14:19:02 +08:00 |
|
miss
|
9961fcf511
|
拖拽调整
|
2017-07-26 14:18:42 +08:00 |
|
caishi
|
f0043373e7
|
新建阶段添加单选多选的设置
|
2017-07-26 11:18:23 +08:00 |
 daiao
|
32c3a9ea70
|
tpi拖动
|
2017-07-26 11:16:16 +08:00 |
|
daiao
|
df36063fe6
|
webssh
|
2017-07-26 10:30:47 +08:00 |
|
daiao
|
a4050c6da9
|
TPI拖拽
|
2017-07-26 10:21:38 +08:00 |
|
miss
|
5b284c8892
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-26 10:08:39 +08:00 |
|
miss
|
37b908771c
|
拖拽的修改。样式的调整
|
2017-07-26 10:06:27 +08:00 |