 daiao
|
de5cd798a9
|
Merge branch 'develop' into dev_daiao
|
2017-05-16 09:58:07 +08:00 |
|
daiao
|
fcc269150b
|
智慧课堂首页
|
2017-05-15 17:24:46 +08:00 |
 huang
|
b48d4298bf
|
tpi中game列表排序问题
|
2017-05-15 17:00:52 +08:00 |
|
daiao
|
f6c760c1cb
|
智慧课堂首页
|
2017-05-15 16:59:26 +08:00 |
|
huang
|
f0f8228a91
|
重新评测处理方式修改
|
2017-05-15 16:37:46 +08:00 |
|
daiao
|
048a16927e
|
Merge branch 'develop' into dev_daiao
|
2017-05-15 09:13:35 +08:00 |
|
huang
|
5f84ec7d48
|
resubmit参数问题
|
2017-05-14 17:41:34 +08:00 |
 guange
|
86527953be
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-14 15:39:09 +08:00 |
|
guange
|
fce131a402
|
头像裁剪上传
|
2017-05-14 15:32:35 +08:00 |
|
huang
|
660f23d0fb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-14 15:28:35 +08:00 |
|
huang
|
fe350546a9
|
重新评测的一些修改
|
2017-05-14 15:28:18 +08:00 |
|
daiao
|
5d1afccb7e
|
智慧课堂（未完）
|
2017-05-14 11:21:42 +08:00 |
 cxt
|
cd977bad3a
|
Merge branch 'dev_cxt' into develop
Conflicts:
public/stylesheets/css/edu-common.css
public/stylesheets/css/taskstyle.css
|
2017-05-13 22:26:14 +08:00 |
|
cxt
|
050a62cc7a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-13 22:24:49 +08:00 |
|
cxt
|
0e868b45d7
|
班级新建和设置（除模块设置）
|
2017-05-13 22:23:53 +08:00 |
|
huang
|
2d8995b91e
|
已完成关卡显示状态
|
2017-05-12 21:48:06 +08:00 |
|
huang
|
0da2b863c3
|
实训提交的时候编码问题
|
2017-05-12 21:07:52 +08:00 |
|
huang
|
77f3cd7272
|
修复回调的时候500问题
|
2017-05-12 19:43:12 +08:00 |
|
huang
|
6173289be4
|
game build的时候状态修改
|
2017-05-12 19:33:26 +08:00 |
|
huang
|
375e0d7486
|
shixun 参数的一些修改
|
2017-05-12 17:15:58 +08:00 |
|
huang
|
8807ef0ba5
|
添加日志和转义
|
2017-05-12 16:19:38 +08:00 |
|
daiao
|
7c3e55b7bd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-12 15:34:03 +08:00 |
|
daiao
|
95f6ff833a
|
智慧课堂首页（未完）
|
2017-05-12 15:33:44 +08:00 |
|
huang
|
f3059f84e5
|
jobName base64编码
|
2017-05-12 15:20:09 +08:00 |
|
huang
|
e4fc59c7cc
|
重置500问题
|
2017-05-11 17:19:13 +08:00 |
|
huang
|
e88696b2e9
|
myshixun引入公共方法
|
2017-05-11 17:04:13 +08:00 |
|
huang
|
5550614a62
|
jenkins地址
|
2017-05-11 16:56:32 +08:00 |
|
huang
|
48182c9359
|
reset的时候删除job
|
2017-05-11 16:52:00 +08:00 |
|
huang
|
a078e0b88b
|
添加日志
|
2017-05-11 16:44:24 +08:00 |
|
huang
|
24da90d900
|
修复git地址问题
|
2017-05-11 16:24:49 +08:00 |
|
daiao
|
60d10b101d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-11 15:11:17 +08:00 |
|
daiao
|
53ff8f5ab3
|
tpi一直能评测
|
2017-05-11 15:10:54 +08:00 |
|
huang
|
c2ae3f7b78
|
完成个人主页
|
2017-05-11 14:43:12 +08:00 |
|
huang
|
f8d9f3294e
|
shixun重置的时候一并删除job及构建内容
|
2017-05-11 10:26:37 +08:00 |
|
huang
|
2d0a2f8a89
|
提供一直可以评测功能
|
2017-05-10 10:43:23 +08:00 |
|
daiao
|
7f6dbecf27
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-08 16:45:07 +08:00 |
|
daiao
|
be9d28f6fd
|
评测机制修改
|
2017-05-08 16:44:51 +08:00 |
|
huang
|
5ea6c193f6
|
允许实训创建者参加挑战
|
2017-05-08 16:36:08 +08:00 |
|
huang
|
999ecff445
|
新建实训的时候自动新建版本库
|
2017-05-08 16:35:29 +08:00 |
|
huang
|
77025d0ae1
|
实训添加重置功能
|
2017-05-08 15:28:35 +08:00 |
|
cxt
|
9e04ed6a2d
|
课程的资源和题库选用到班级
|
2017-05-08 15:26:16 +08:00 |
|
cxt
|
ff587da397
|
基本资料页的bug修复
|
2017-05-08 14:52:10 +08:00 |
|
cxt
|
d23be7777d
|
课程题库发送到班级
|
2017-05-05 22:09:48 +08:00 |
|
cxt
|
67499b9ce2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-05 21:10:04 +08:00 |
|
cxt
|
0319ff96fa
|
保存基本资料报500
|
2017-05-05 21:09:46 +08:00 |
|
huang
|
da19d8a7fd
|
添加日志
|
2017-05-05 20:57:18 +08:00 |
|
cxt
|
66640b5a14
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/base_edu.html.erb
app/views/layouts/login_bigdata.html.erb
public/stylesheets/css/edu-common.css
|
2017-05-05 20:21:15 +08:00 |
|
cxt
|
3fdec893c9
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/layouts/base_edu.html.erb
public/stylesheets/css/edu-public.css
|
2017-05-05 19:37:29 +08:00 |
|
cxt
|
6fe571cc99
|
课程资源库和课程题库
|
2017-05-05 19:36:32 +08:00 |
|
huang
|
7f70bad8f1
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-05-05 16:14:50 +08:00 |