 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 |
|
XuCheng642
|
f54453f32c
|
管理员界面新增专业
|
2017-08-25 16:11:35 +08:00 |
|
huang
|
85e6f75075
|
编辑页面添加webssh
|
2017-08-25 15:25:56 +08:00 |
|
huang
|
77af9910f1
|
实训新建的时候添加webssh勾选项
|
2017-08-25 14:50:15 +08:00 |
|
huang
|
548ba591e8
|
gitlab触发跳过系统身份认证
|
2017-08-24 14:36:46 +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 |
|
huang
|
de1c18084a
|
gitlab hook路由定义
|
2017-08-22 16:50:07 +08:00 |
|
huang
|
93c6046b40
|
实训控制器中常量整理
|
2017-08-22 09:20:25 +08:00 |
|
huang
|
ccc77ef427
|
添加机器学习镜像已经跳过gitlab hook登录验证
|
2017-08-21 15:50:18 +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 |
 daiao
|
303ad2f647
|
TPM的版本库的代码文件在编辑时，js效果有问题
|
2017-08-20 16:32:14 +08:00 |
|
huang
|
1344f4aa82
|
修复一次性添加多个合作者，部分合作者不成功问题
|
2017-08-18 09:25:51 +08:00 |
|
huang
|
7ec2cf834f
|
删除组员的时候同步gitlab数据
|
2017-08-17 17:27:35 +08:00 |
|
huang
|
f2fe59ed0f
|
添加实训合作者，数据同步github
|
2017-08-17 17:18:30 +08:00 |
|
huang
|
62aa1e28c6
|
实训合作者添加按”login“”mail“搜索结果
|
2017-08-17 16:08:48 +08:00 |
|
daiao
|
11325d3e9b
|
新建实训需要先绑定邮箱
|
2017-08-15 09:57:03 +08:00 |
|
daiao
|
4e5f9ab43e
|
新建实训需要绑定邮箱
|
2017-08-15 09:15:09 +08:00 |
|
huang
|
771863e009
|
修改实训post中间层uri转换方式
|
2017-08-13 10:48:05 +08:00 |
|
huang
|
355ffddbd4
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:14:37 +08:00 |
|
huang
|
cbc342ad23
|
实训迁移增加可定义字段及超级管理员权限
|
2017-08-11 20:03:33 +08:00 |
|
daiao
|
6bf0a8658e
|
实训更新排序不对
|
2017-08-11 19:29:44 +08:00 |
|
huang
|
572b367218
|
解决上线文件报错问题
|
2017-08-11 17:21:25 +08:00 |
|
huang
|
1fee1dd7f9
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-11 17:15:39 +08:00 |
 cxt
|
009761abde
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/views/challenges/_content_list.html.erb
|
2017-08-11 16:29:30 +08:00 |
|
cxt
|
139a0597d8
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/views/layouts/base_management.html.erb
app/views/managements/_class_shixuns_list.html.erb
app/views/managements/_users_authorization_list.html.erb
app/views/managements/identity_authentication.html.erb
app/views/managements/shixun_authorization.html.erb
app/views/managements/subject_authorization.html.erb
config/routes.rb
public/javascripts/edu/account.js
public/javascripts/edu/syllabus.js
|
2017-08-11 15:20:56 +08:00 |
|
huang
|
54aa793385
|
实训迁移完整版
|
2017-08-11 15:15:07 +08:00 |
|
huang
|
d92d4e8ee7
|
Merge branch 'develop' into dev_kubernete
Conflicts:
.idea/dataSources.xml
app/controllers/shixuns_controller.rb
|
2017-08-11 14:52:08 +08:00 |
|
huang
|
f207d85e8a
|
新框架下已打过的实训数据迁移
|
2017-08-11 14:50:06 +08:00 |
|
cxt
|
2e55fd4a8f
|
请增加实训和实训套件的隐藏 功能
|
2017-08-11 14:43:14 +08:00 |
|
XuCheng642
|
d3a67b42b2
|
超级管理员相关页面
|
2017-08-11 11:27:04 +08:00 |
|
huang
|
2fe2b9a825
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-10 16:19:03 +08:00 |
|
huang
|
f98ed3c238
|
解决不同Ruby版本Base64解码问题
|
2017-08-10 14:33:34 +08:00 |
|
huang
|
d27c5cb2a3
|
调试开启实训
|
2017-08-10 10:00:11 +08:00 |
|
daiao
|
272368ed9e
|
实训首页按更新时间排序
|
2017-08-08 13:53:39 +08:00 |
|
huang
|
abde5ffd47
|
优化开启实训流程开启实训；修改game和myshixun的随机生成identifier
|
2017-08-08 10:49:44 +08:00 |
|
daiao
|
a8eff66150
|
已发布的实训，配置页除了“技术平台”其它项允许修改
|
2017-08-08 10:07:36 +08:00 |
|
cxt
|
f4d7d1b51e
|
实训首页的排序
|
2017-08-08 09:32:46 +08:00 |
|
cxt
|
73e74f6604
|
实训首页的排序“最热”和“最新”互换
|
2017-08-08 09:19:10 +08:00 |
|
huang
|
a0c3e827bb
|
简化发布实训代码
|
2017-08-07 15:56:04 +08:00 |
|
huang
|
63ce126282
|
优化中间层测试集；修改需要重置记录
|
2017-08-07 15:36:53 +08:00 |
|
huang
|
b3b1e222ef
|
实训修改产生更新信息方法修改（添加触发异常机制）
|
2017-08-07 15:08:43 +08:00 |
|
huang
|
0b51fda4bc
|
实训更新的时候添加事务处理、失败跳转有原来的详情页面修改在setting页面弹框提示
|
2017-08-07 14:48:51 +08:00 |
|
huang
|
4bad2e3087
|
优化新建实训代码，添加事务及异常处理
|
2017-08-07 14:28:43 +08:00 |
|
huang
|
7f9de6f4ac
|
base64编码改成安全编码
|
2017-08-06 15:34:24 +08:00 |
|
huang
|
b5fe488328
|
克隆的时候使用TPM地址
|
2017-08-06 10:48:09 +08:00 |