 huang
|
a8d6b16046
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-24 16:43:37 +08:00 |
 cxt
|
9ca6f450fe
|
作业列表、定时执行任务
|
2017-05-24 16:27:55 +08:00 |
|
huang
|
cf8d52a5bd
|
重置相关代码错误提示
|
2017-05-24 10:11:45 +08:00 |
|
huang
|
48559195f9
|
评测失败添加等级提示
|
2017-05-23 21:26:42 +08:00 |
|
huang
|
63435b5d00
|
发布和更新challenge错误提示等级
|
2017-05-23 20:56:36 +08:00 |
|
huang
|
15b86ea78a
|
发布实训错误提示等级封装
|
2017-05-23 20:53:27 +08:00 |
|
huang
|
18f55234f7
|
实训开启成功弹框样式及提示信息修改
|
2017-05-23 20:44:57 +08:00 |
|
huang
|
128d840037
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 19:05:19 +08:00 |
 daiao
|
522a546ec1
|
班级的模块设置
|
2017-05-23 16:00:40 +08:00 |
|
cxt
|
1e8a36a8d2
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/student_work/show.html.erb
|
2017-05-23 15:32:16 +08:00 |
|
cxt
|
935922b365
|
普通、编程、分组作业的提交和编辑
|
2017-05-23 15:18:53 +08:00 |
|
huang
|
c9593f7d17
|
实训作业
|
2017-05-22 21:31:28 +08:00 |
|
huang
|
61f2f632ca
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_edu.html.erb
|
2017-05-22 11:14:18 +08:00 |
|
cxt
|
f46bd2ac06
|
新版作业
|
2017-05-22 10:29:51 +08:00 |
|
huang
|
35f0faf567
|
重新评测结果没有及时返回问题
|
2017-05-19 21:39:57 +08:00 |
|
huang
|
ae10991ae6
|
合作者权限控制
|
2017-05-19 17:30:30 +08:00 |
|
huang
|
f88bf9bcdb
|
实训添加合作者功能
|
2017-05-19 16:56:09 +08:00 |
|
huang
|
aa7bb35cc9
|
个人主页实训tab
|
2017-05-19 10:34:56 +08:00 |
|
cxt
|
b74570f517
|
Merge branch 'develop' into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_courses.html.erb
public/stylesheets/css/edu-public.css
|
2017-05-18 15:44:57 +08:00 |
|
cxt
|
5fdef398a5
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
|
2017-05-18 15:40:32 +08:00 |
|
cxt
|
45fecb8b8d
|
新建作业和作业设置
|
2017-05-18 15:39:53 +08:00 |
|
daiao
|
aa0ed21b8c
|
Merge branch 'dev_daiao' into develop
|
2017-05-18 14:26:40 +08:00 |
|
daiao
|
e0a4a9b1ab
|
TMP新增预备知识页面，新建/配置加入预备知识MD
|
2017-05-18 11:30:29 +08:00 |
|
huang
|
59fadefc4f
|
编程作业、普通作业作品显示
|
2017-05-17 15:22:48 +08:00 |
|
huang
|
6da6840d73
|
修复game列表链接问题
|
2017-05-16 10:19:16 +08:00 |
|
huang
|
b48d4298bf
|
tpi中game列表排序问题
|
2017-05-15 17:00:52 +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 |
|
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
|
0e868b45d7
|
班级新建和设置（除模块设置）
|
2017-05-13 22:23:53 +08:00 |
|
huang
|
2d0a2f8a89
|
提供一直可以评测功能
|
2017-05-10 10:43:23 +08:00 |
|
huang
|
77025d0ae1
|
实训添加重置功能
|
2017-05-08 15:28:35 +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
|
e06dba1879
|
测试集通过的时候显示对勾，ajax加载图片无法显示问题
|
2017-05-05 17:23:21 +08:00 |
|
huang
|
ea0d90a383
|
实训积分系统
|
2017-05-04 17:29:00 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
daiao
|
660e29fe3d
|
tpm列表
|
2017-05-03 17:46:59 +08:00 |
|
huang
|
ec22329e5f
|
完善资料积分、积分不重复计算
|
2017-05-03 16:51:26 +08:00 |
|
huang
|
1aee70dc02
|
完成用户注册积分奖励
|
2017-05-03 15:23:01 +08:00 |
|
cxt
|
e810d93491
|
课程资源库
|
2017-05-03 10:10:27 +08:00 |
|
huang
|
c477b634cb
|
实训统计列表
|
2017-05-02 17:18:34 +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
|
60d33cf661
|
课程首页（除课程资源库和课程题库）
|
2017-04-28 22:53:34 +08:00 |
|
huang
|
5da2a7ee59
|
查看关卡权限修改
|
2017-04-28 10:21:02 +08:00 |
|
cxt
|
e079bfaa6c
|
Merge branch 'dev_huang' into dev_cxt
|
2017-04-27 16:13:07 +08:00 |
|
cxt
|
a69ba56711
|
基本资料的修改
|
2017-04-27 15:53:13 +08:00 |
|
huang
|
18543c87ca
|
实训首页添加reduce排序
|
2017-04-27 10:18:15 +08:00 |
|
huang
|
4d30251bf3
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 14:20:26 +08:00 |