 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 |
|
huang
|
da60bb87bc
|
开启实训的时候git地址传送tpi的
|
2017-08-04 22:02:20 +08:00 |
|
huang
|
04c142698f
|
kubernetes新架构下的一些修改
|
2017-08-04 14:19:22 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
cxt
|
26f68e019b
|
实训套件首页显示的数据应该包括只创建了套件但是没有添加阶段的数据
|
2017-07-24 14:58:27 +08:00 |
|
daiao
|
1da8405726
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-21 15:26:28 +08:00 |
|
daiao
|
ac6e9a755c
|
项目实训首页的筛选条件新增“所有状态”
|
2017-07-21 15:24:22 +08:00 |
 caishi
|
eb58421cd1
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/users/show.html.erb
public/stylesheets/css/edu-common.css
public/stylesheets/css/edu-public.css
|
2017-07-21 15:21:55 +08:00 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
huang
|
b83a333a9d
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/shixuns/index.html.erb
|
2017-07-20 17:19:46 +08:00 |
|
caishi
|
f3fd5a521d
|
班级讨论区页面
|
2017-07-20 15:48:49 +08:00 |
|
cxt
|
482022a58a
|
TPI评论区操作按钮的显隐
|
2017-07-20 09:21:12 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
daiao
|
3aa8f4344e
|
在实训配置页面点击继续实战，跳转的页面给出页面已删除
|
2017-07-19 11:59:00 +08:00 |
|
daiao
|
7051b5f912
|
项目实训最热排名应该按人数进行降序排列
|
2017-07-19 10:13:36 +08:00 |
|
cxt
|
c25255dfd6
|
删除实训时关联删除课程实训
|
2017-07-17 10:51:37 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |