 daiao
|
ea89bbc30a
|
Test的高度调整为1/3
|
2017-05-02 13:56:57 +08:00 |
 cxt
|
f1c17c14e5
|
课程：添加成员和更换管理员的弹框调整
|
2017-05-02 11:23:45 +08:00 |
|
daiao
|
374c5b2639
|
Codemirror的配色方案改为codefights的配色方案
|
2017-05-02 11:07:22 +08:00 |
|
daiao
|
7fbe972de0
|
实训tpm新建阶段，报错信息需要靠右缩进，与边框对齐
|
2017-05-02 09:18:22 +08:00 |
|
daiao
|
f49fa88875
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-02 09:14:34 +08:00 |
|
daiao
|
9211a7fa45
|
实训新建阶段时，点击保存报错的话，应该快速定位显示第一个报错的输入框
|
2017-05-02 09:14:11 +08:00 |
|
cxt
|
d040c95305
|
个人主页样式调整
|
2017-05-02 09:10:35 +08:00 |
|
cxt
|
2aed879c95
|
Merge branch 'develop' into dev_cxt
|
2017-05-02 08:50:15 +08:00 |
 huang
|
a12dd6f21e
|
防止ajax没获取数据请求被取消
|
2017-04-28 23:35:27 +08:00 |
|
huang
|
7552f803ab
|
解决代码合并后一样样式冲突问题
|
2017-04-28 23:29:45 +08:00 |
|
cxt
|
0188d09454
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/layouts/new_base.html.erb
public/stylesheets/css/edu-public.css
|
2017-04-28 22:55:45 +08:00 |
|
cxt
|
cbda6a7e5c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 22:54:40 +08:00 |
|
cxt
|
60d33cf661
|
课程首页（除课程资源库和课程题库）
|
2017-04-28 22:53:34 +08:00 |
|
huang
|
fa060f5fa0
|
解决new_base公共样式顶部不显示的问题
|
2017-04-28 22:23:41 +08:00 |
|
huang
|
4fc5ddd3b9
|
编码问题
|
2017-04-28 21:18:23 +08:00 |
|
huang
|
11a831df66
|
解决Base64安全编码问题
|
2017-04-28 20:24:33 +08:00 |
|
daiao
|
0823166434
|
实训耗时
|
2017-04-28 20:00:26 +08:00 |
|
daiao
|
4620fd6ec0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 18:49:37 +08:00 |
|
daiao
|
e052e59dc6
|
字符编码
|
2017-04-28 18:49:18 +08:00 |
|
huang
|
6b32f6ec75
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 17:37:53 +08:00 |
|
huang
|
bd2260aca0
|
文件名异常
|
2017-04-28 17:37:18 +08:00 |
 Linda
|
893bbbd31e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 17:00:53 +08:00 |
|
Linda
|
60539680c7
|
实训首页列表对齐
|
2017-04-28 17:00:28 +08:00 |
|
daiao
|
8553229d4c
|
评测时间
|
2017-04-28 16:30:03 +08:00 |
|
daiao
|
c65f1ed387
|
test
|
2017-04-28 16:10:09 +08:00 |
|
daiao
|
68dfd04ea4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 16:02:13 +08:00 |
|
daiao
|
cbd91be0d0
|
实训耗时
|
2017-04-28 16:01:38 +08:00 |
|
Linda
|
19884eda96
|
实训头部头像下拉样式问题修改
|
2017-04-28 15:27:38 +08:00 |
|
daiao
|
1f068baee0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 15:16:45 +08:00 |
|
daiao
|
1ea4f8ce29
|
新建实训多个editorMD输入时，默认输入第二个
|
2017-04-28 15:16:22 +08:00 |
|
huang
|
8588fbacf3
|
总得分统计
|
2017-04-28 15:11:11 +08:00 |
|
daiao
|
62c301d5e2
|
实训参考答案显示与编辑使用editorMD
|
2017-04-28 14:47:18 +08:00 |
|
daiao
|
456b348329
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 11:25:41 +08:00 |
|
daiao
|
62473d7fae
|
实训样式调整
|
2017-04-28 11:25:21 +08:00 |
|
huang
|
351da6d9cd
|
boolean类型转换成0/1
|
2017-04-28 10:24:40 +08:00 |
|
huang
|
7fb67fd8bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 10:21:27 +08:00 |
|
huang
|
5da2a7ee59
|
查看关卡权限修改
|
2017-04-28 10:21:02 +08:00 |
|
Linda
|
fdf72d982a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 10:12:30 +08:00 |
|
Linda
|
d7c05853ff
|
导航点击头像悬浮显示效果延迟
导航搜索框下拉火狐浏览器超边距修改
|
2017-04-28 10:11:29 +08:00 |
|
daiao
|
849d00f068
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 09:51:40 +08:00 |
|
daiao
|
02547f54fa
|
耗时显示不是实时更新的，只有点击评测按钮后耗时统计才会发生改变
|
2017-04-28 09:51:18 +08:00 |
|
huang
|
293c92c594
|
处理jenkins中间层返回错误信息中带 “+” 问题
|
2017-04-28 09:13:43 +08:00 |
|
Linda
|
1f2bcfbe2b
|
Merge branch 'develop' into dev_linda
|
2017-04-28 09:03:34 +08:00 |
|
huang
|
30507006eb
|
解决中文乱码
|
2017-04-27 17:34:12 +08:00 |
|
Linda
|
45e1eaa4ca
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-27 17:20:07 +08:00 |
|
Linda
|
57f61361bc
|
loading修改
|
2017-04-27 17:19:28 +08:00 |
|
huang
|
6d5ecdf70c
|
解决首页无法退出登录的问题
|
2017-04-27 17:05:39 +08:00 |
|
huang
|
4d7f192a44
|
区分登录状态和没登陆状态导航栏
|
2017-04-27 16:40:00 +08:00 |
|
huang
|
b9ddfec8d2
|
游戏实训改成项目实训
|
2017-04-27 16:29:26 +08:00 |
|
huang
|
a61d0750ae
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2017-04-27 16:26:03 +08:00 |