 huang
|
29acff9dde
|
去掉抛出异常
|
2017-09-22 10:58:15 +08:00 |
|
huang
|
a234bdc01b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 10:47:41 +08:00 |
|
huang
|
3df0b71d0f
|
复制的时候添加错误提醒
|
2017-09-22 10:09:34 +08:00 |
|
huang
|
8457e4d784
|
完成实训的复制功能
|
2017-09-22 09:52:13 +08:00 |
|
huang
|
84643fe2cb
|
实训复制添加可配置功能
|
2017-09-21 17:25:51 +08:00 |
|
huang
|
945a3772e6
|
实训复制完善
|
2017-09-21 16:50:13 +08:00 |
|
huang
|
f88bc764bb
|
实训关卡、测试集、tag复制
|
2017-09-21 15:20:39 +08:00 |
 daiao
|
e86720be6b
|
全部实训最新的排序不正确
|
2017-09-20 10:19:41 +08:00 |
|
daiao
|
d1cf530237
|
实训首页的全部显示的数据和检索的数据不一致，全部显示的数据不算隐藏的
|
2017-09-20 10:00:47 +08:00 |
|
huang
|
fcf78d07dd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-19 17:25:15 +08:00 |
|
huang
|
66ef740235
|
复制注释
|
2017-09-19 17:25:03 +08:00 |
 caishi
|
a09450a805
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/games/_choice_question.html.erb
|
2017-09-19 17:17:40 +08:00 |
|
caishi
|
df60c289ad
|
选择题选项换行、开始实战的加载层
|
2017-09-19 17:15:50 +08:00 |
|
huang
|
3412a69c3b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
Gemfile
|
2017-09-18 15:26:18 +08:00 |
|
huang
|
fcaa798620
|
注释掉提交代码hook触发事件
|
2017-09-18 15:25:34 +08:00 |
|
daiao
|
71d2c18442
|
修改实训技术平台后，需要重新生成TPM脚本
|
2017-09-18 14:21:29 +08:00 |
|
huang
|
bfe758be78
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/challenges/_single_or_multiple_question.html.erb
app/views/messages/_common_reply_box.html.erb
app/views/praise_tread/_edu_praise.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-09-15 21:13:14 +08:00 |
 miss
|
34d464bf41
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/users/show.html.erb
# config/routes.rb
# public/stylesheets/css/edu-common.css
|
2017-09-14 09:14:55 +08:00 |
|
miss
|
14209be057
|
添加学生弹框样式问题，实训tpm版本库页面。模块之间需要有距离，ta的主页样式问题，我的资料页去除灰色背景并调整间距，成长中心的表格样式修正
我的主页和各个功能首页的左侧功能条，部分点击事项更改为直接刷新显示
个人主页的问题反馈，点击进入超级管理员的留言页面（）
我的题库和公共题库页尾显示的内容，请保持区域内上下居中
实训和课堂搜索后，无数据时的内容区域与文字要有间距
实训的配置页面不需要重复显示版本库
个人主页、我的课堂和我的实训的新建、加入按钮样式与各首页保持一致
我的留言、给TA留言和私信的页面需要去掉背景灰色和加边框阴影
在线课堂首页的搜索tip需要更换新样式，课堂名称显示全的话不显示tip，带有省略号的话需要有tip
|
2017-09-14 09:09:12 +08:00 |
 cxt
|
c205c373a3
|
Merge branch 'develop' into dev_cs
Conflicts:
app/controllers/shixuns_controller.rb
app/views/challenges/edit.html.erb
app/views/layouts/base_edu_course.html.erb
app/views/shixuns/_shixun_top.html.erb
app/views/shixuns/search_user_courses.js.erb
public/stylesheets/css/edu-common.css
|
2017-09-13 16:19:33 +08:00 |
|
cxt
|
e87bc406a6
|
添加日志
|
2017-09-12 17:32:50 +08:00 |
|
cxt
|
847a78620f
|
实训发送至报500
|
2017-09-12 17:05:21 +08:00 |
|
cxt
|
4c7eb01bbf
|
实训tpm的发送至的弹框中的数据少了新建课堂的
|
2017-09-11 15:14:19 +08:00 |
|
cxt
|
d36a95d90c
|
实训的多个课程关联
|
2017-09-11 10:36:12 +08:00 |
|
cxt
|
f457d87755
|
实训首页的检索
|
2017-09-08 20:30:25 +08:00 |
|
daiao
|
df1e8988b3
|
实训发送至功能
|
2017-09-08 17:05:07 +08:00 |
|
huang
|
234a8d7f7d
|
解决版本库类型更新不成功的问题
|
2017-09-08 15:53:32 +08:00 |
|
huang
|
159a91878f
|
解决异常问题
|
2017-09-08 15:49:48 +08:00 |
|
huang
|
9fe9095837
|
优化开启实训方法；解决实训偶尔被fork多次的问题；解决开启实训的时候版本库为空的问题
|
2017-09-08 14:53:36 +08:00 |
|
cxt
|
3c79e6fc4e
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/challenges/edit.html.erb
app/views/shixuns/_send_shixuns.html.erb
app/views/shixuns/_shixun_top.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-07 16:23:11 +08:00 |
|
cxt
|
4bb1498322
|
实训的发送至
|
2017-09-05 17:01:28 +08:00 |
|
cxt
|
ef3c4f1d51
|
简化统一实训和课堂的专业及课程名称
|
2017-09-05 11:03:49 +08:00 |
|
huang
|
7b57e04259
|
解决实训首页显示顺序和搜索顺序不一致的问题
|
2017-09-01 17:21:53 +08:00 |
|
huang
|
6cce4c282c
|
实训路径中开启实训权限控制
|
2017-08-31 16:25:25 +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 |
|
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 |