 daiao
|
d417ca0cf3
|
超级管理员的试用授权列表手动授权不应该在审批页面新增申请记录
|
2017-08-31 15:17:16 +08:00 |
|
daiao
|
dde055fd3a
|
实训TPI提示等待时间信息
|
2017-08-29 17:07:11 +08:00 |
|
daiao
|
752e9799f4
|
全部实训和在线课堂的搜索icon点开之后显示不一致
|
2017-08-29 14:16:28 +08:00 |
|
daiao
|
4e35f0adf5
|
专业列表
|
2017-08-29 09:15:28 +08:00 |
|
daiao
|
f3a4ca2a51
|
Merge branch 'dev_xucheng' into dev_daiao
Conflicts:
app/controllers/managements_controller.rb
app/views/student_work/index.html.erb
public/stylesheets/css/edu-common.css
|
2017-08-29 09:14:22 +08:00 |
 XuCheng642
|
8f74cc4b42
|
iuuue
|
2017-08-29 09:08:15 +08:00 |
 cxt
|
56f3259eb1
|
留言列表的序号显示
|
2017-08-28 18:37:17 +08:00 |
|
XuCheng642
|
e23dfaa2f8
|
issue解决
|
2017-08-28 17:00:44 +08:00 |
|
cxt
|
a016624115
|
实训留言
|
2017-08-28 16:58:10 +08:00 |
|
cxt
|
088f12befe
|
Merge branch 'dev_cxt' into develop
Conflicts:
config/routes.rb
|
2017-08-28 16:29:50 +08:00 |
|
cxt
|
6b8d4079a2
|
实训留言列表
|
2017-08-28 16:27:46 +08:00 |
|
cxt
|
baa512e4d7
|
作业设置的相关修改
|
2017-08-28 15:02:54 +08:00 |
|
daiao
|
50b7656f41
|
我的实训页面已参与的时间排序不正确，与主页中我的实训排序不一致
|
2017-08-28 11:27:35 +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 |
 huang
|
f6240f7d59
|
新建作业的时候填入列表页面
|
2017-08-27 10:55:46 +08:00 |
|
huang
|
dd37e049d2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:27:35 +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 |
|
huang
|
86000572f6
|
实训直接在命令中编辑的话让实训产生重置
|
2017-08-25 19:40:05 +08:00 |
|
huang
|
6ccb58b863
|
测试版webssh和中间层post请求区分开（http和域名问题）
|
2017-08-25 17:22:53 +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 |
|
XuCheng642
|
d0181f80b7
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 16:25:12 +08:00 |
|
cxt
|
a944456e57
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/subjects/_subject_list.html.erb
|
2017-08-25 16:13:46 +08:00 |
|
XuCheng642
|
f54453f32c
|
管理员界面新增专业
|
2017-08-25 16:11:35 +08:00 |
|
cxt
|
5bd3e4a185
|
实训课程的调整
|
2017-08-25 16:11:21 +08:00 |
|
cxt
|
20b509a985
|
镜像管理的删除
|
2017-08-25 15:50:00 +08:00 |
|
huang
|
85e6f75075
|
编辑页面添加webssh
|
2017-08-25 15:25:56 +08:00 |
|
huang
|
77af9910f1
|
实训新建的时候添加webssh勾选项
|
2017-08-25 14:50:15 +08:00 |
|
cxt
|
8febb20612
|
基本资料未完善时的提示
|
2017-08-25 09:44:57 +08:00 |
|
cxt
|
68a901a533
|
修改资料页面点击安全设置中绑定或更改，左边栏目会跳到“职业认证”
|
2017-08-24 20:12:27 +08:00 |
|
cxt
|
49bbd36c12
|
实训套件的改版
|
2017-08-24 20:01:34 +08:00 |
|
huang
|
2c7fe618bb
|
解决用户没有提交代码依旧能开启挑战的问题
|
2017-08-24 17:50:29 +08:00 |
|
cxt
|
71d8fd4420
|
镜像管理相关
|
2017-08-24 17:32:05 +08:00 |
|
huang
|
548ba591e8
|
gitlab触发跳过系统身份认证
|
2017-08-24 14:36:46 +08:00 |
|
huang
|
585674fb71
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-24 14:18:25 +08:00 |
|
huang
|
5565c486d1
|
git hook post 请求跳过登录验证
|
2017-08-24 14:17:39 +08:00 |
|
XuCheng642
|
0d4c234d51
|
支撑实训和新增实训页面列表的修改
|
2017-08-24 11:32:48 +08:00 |
|
daiao
|
7f8c30d31f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/iframes/html_content.html.erb
|
2017-08-23 10:53:50 +08:00 |
|
daiao
|
e9f303b248
|
html渲染使用Iframes
|
2017-08-23 10:52:19 +08:00 |
|
huang
|
332eed93a0
|
修复版本库库不存在的时候实训版本库500问题
|
2017-08-23 10:34:33 +08:00 |
|
huang
|
61f720295a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 10:01:45 +08:00 |
|
huang
|
5a26edd483
|
0
|
2017-08-23 10:01:24 +08:00 |
|
huang
|
bfa567bc94
|
iframe测试框架
|
2017-08-23 10:00:52 +08:00 |
|
daiao
|
e9b7a98aba
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 09:42:57 +08:00 |
|
daiao
|
f1c0b688a0
|
邮箱注册后没有激活，重新登录后跳到邮箱激活页面，点击帮助中心跳转500
|
2017-08-23 09:42:39 +08:00 |
|
XuCheng642
|
ce362108f5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 09:25:00 +08:00 |
|
XuCheng642
|
bf01c1b4a8
|
issue的修改
|
2017-08-23 09:24:32 +08:00 |
|
huang
|
c48593f28a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-22 16:50:25 +08:00 |
|
huang
|
de1c18084a
|
gitlab hook路由定义
|
2017-08-22 16:50:07 +08:00 |