 caishi
|
a5124c9952
|
TPI加载效果
|
2017-08-18 16:21:32 +08:00 |
|
caishi
|
ab5b9ec5c3
|
Merge branch 'dev_cs' into develop
|
2017-08-18 15:40:50 +08:00 |
|
caishi
|
3aa957a061
|
tip内容
|
2017-08-18 15:35:58 +08:00 |
|
caishi
|
7ce1cac74a
|
Merge branch 'dev_cs' into develop
|
2017-08-18 15:32:30 +08:00 |
|
caishi
|
257eba7fae
|
新建课程输入框颜色
|
2017-08-18 15:31:51 +08:00 |
|
caishi
|
0d48f328e7
|
Merge branch 'dev_cs' into develop
|
2017-08-18 15:25:50 +08:00 |
|
caishi
|
d478b297cb
|
实训配置页隐藏提示，icon移入效果
|
2017-08-18 15:24:47 +08:00 |
 daiao
|
1ddac249e2
|
Merge branch 'dev_TPI' into develop
Conflicts:
public/stylesheets/css/edu-common.css
public/stylesheets/css/taskstyle.css
|
2017-08-18 14:03:05 +08:00 |
 cxt
|
0d6746b5c2
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 14:01:10 +08:00 |
|
cxt
|
f25324e23d
|
Merge branch 'dev_cxt' into develop
|
2017-08-18 14:00:11 +08:00 |
|
cxt
|
6c9722c6ea
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-18 13:59:23 +08:00 |
|
caishi
|
4ecca2df04
|
Merge branch 'dev_cs' into develop
|
2017-08-18 13:59:12 +08:00 |
|
cxt
|
1c4ca260ee
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-08-18 13:59:10 +08:00 |
 huang
|
e6c6d2f57b
|
修复首页课程列表中用户路由错误问题
|
2017-08-18 11:04:16 +08:00 |
|
caishi
|
bc71a63eb6
|
边框阴影以及加载框里字体颜色
|
2017-08-18 10:59:10 +08:00 |
 XuCheng642
|
bb4e90ca7b
|
部门的审批
|
2017-08-18 10:50:35 +08:00 |
|
caishi
|
5922513e27
|
实训套件页面改版（未完成，已注释）
|
2017-08-18 10:45:12 +08:00 |
|
daiao
|
648b09e2d9
|
在没有权限访问页面进行留言，内容为空点击留言跳转500
|
2017-08-18 09:43:05 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
cxt
|
15c5f91d06
|
实训tpm参考答案页面，编辑时参考答案显示为“参考答案1111” 正常
|
2017-08-18 09:41:03 +08:00 |
|
huang
|
1d1b1634f9
|
实训合作历史数据同步到gitlab
|
2017-08-18 09:30:25 +08:00 |
|
daiao
|
43df4f1a5d
|
webssh根据屏幕高度自适应
|
2017-08-18 09:26:41 +08:00 |
|
huang
|
76afb92f37
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-18 09:26:31 +08:00 |
|
huang
|
1344f4aa82
|
修复一次性添加多个合作者，部分合作者不成功问题
|
2017-08-18 09:25:51 +08:00 |
 miss
|
d4e888b980
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-17 17:34:29 +08:00 |
|
miss
|
bd08eee523
|
平台Tip样式的更换
|
2017-08-17 17:33:38 +08:00 |
|
huang
|
7ec2cf834f
|
删除组员的时候同步gitlab数据
|
2017-08-17 17:27:35 +08:00 |
|
huang
|
f2fe59ed0f
|
添加实训合作者，数据同步github
|
2017-08-17 17:18:30 +08:00 |
|
cxt
|
e1cbc8015f
|
添加学生的代码优化
|
2017-08-17 16:34:38 +08:00 |
|
daiao
|
d97c3548e0
|
webssh报错
|
2017-08-17 16:31:08 +08:00 |
|
daiao
|
d9628aaac4
|
tpi优化缺陷调整
|
2017-08-17 16:09:44 +08:00 |
|
huang
|
90c01ff9d8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-17 16:09:06 +08:00 |
|
huang
|
62aa1e28c6
|
实训合作者添加按”login“”mail“搜索结果
|
2017-08-17 16:08:48 +08:00 |
|
cxt
|
d0d133668c
|
底部的qq信息框间距调整
|
2017-08-17 14:52:34 +08:00 |
|
daiao
|
bac84938b4
|
webssh连接增加行数
|
2017-08-17 14:46:08 +08:00 |
|
daiao
|
da1e4c2b5d
|
Merge branch 'develop' into dev_TPI
Conflicts:
app/controllers/games_controller.rb
app/controllers/shixuns_controller.rb
app/views/games/_code_actions.html.erb
app/views/games/_repository.html.erb
public/javascripts/application.js
public/stylesheets/css/taskstyle.css
|
2017-08-17 14:42:26 +08:00 |
|
daiao
|
d7f32da860
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-17 14:36:21 +08:00 |
|
daiao
|
99e6e1df60
|
webssh高度只适应
|
2017-08-17 14:36:04 +08:00 |
|
caishi
|
4b94933540
|
修改Issues
|
2017-08-17 14:07:55 +08:00 |
|
caishi
|
3c418c771f
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/layouts/_public_left_info.html.erb
|
2017-08-17 14:04:50 +08:00 |
|
caishi
|
7cc1b2426f
|
Issues修改
|
2017-08-17 10:29:54 +08:00 |
|
miss
|
0629886965
|
技能标签的修改
|
2017-08-16 17:47:07 +08:00 |
|
miss
|
3db33d0bc7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-16 17:37:03 +08:00 |
|
miss
|
a20044c593
|
技能标签问题的修改
|
2017-08-16 17:35:21 +08:00 |
|
cxt
|
ecfee445c3
|
复选框列表在翻页后原来页的选择被丢掉了
|
2017-08-16 17:34:25 +08:00 |
|
cxt
|
c8984e057a
|
题库中新建实训的选择实训框中一开始显示的是昵称，在搜索框中点击搜索按钮后，昵称变为真实姓名
|
2017-08-16 15:51:14 +08:00 |
|
cxt
|
b4e454dc8b
|
技能标签的翻页有问题
|
2017-08-16 15:41:56 +08:00 |
|
daiao
|
c3f9ad0809
|
实训没有选择命令行，但是点击代码旁边去出现命令行的页面
|
2017-08-16 14:52:27 +08:00 |
|
daiao
|
2e3b0ecfbf
|
实训简介编辑时光标显示问题
|
2017-08-16 14:28:00 +08:00 |
|
daiao
|
6ecea224f1
|
评测样式调整
|
2017-08-16 11:23:22 +08:00 |