 huang
|
3b57616986
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
public/stylesheets/css/edu-class.css
|
2017-06-09 16:55:22 +08:00 |
|
huang
|
a0cff38470
|
用户列表试用界面
|
2017-06-08 16:15:24 +08:00 |
 cxt
|
09a4b41381
|
发送资源中的班级数据有缺失，没有找到新建的班级
|
2017-06-08 09:45:28 +08:00 |
|
huang
|
87071cacce
|
认证
|
2017-06-07 17:39:24 +08:00 |
|
cxt
|
3c4388869a
|
普通作业不应该有“进入实训”的入口
|
2017-06-02 19:19:41 +08:00 |
|
cxt
|
6ff88ef129
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-02 14:27:42 +08:00 |
|
cxt
|
15345d93bd
|
作品列表的多条件筛选
|
2017-06-02 14:27:12 +08:00 |
|
huang
|
dbe37b1df6
|
实训中增加过滤条件和搜索结果
|
2017-06-01 14:35:31 +08:00 |
 daiao
|
0d29448be7
|
我的课程完整版
|
2017-05-27 16:49:45 +08:00 |
|
daiao
|
22d7e92d4c
|
班级模块功能修复
|
2017-05-27 14:55:06 +08:00 |
|
huang
|
d935388689
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 14:21:56 +08:00 |
|
huang
|
ed365cf796
|
添加实训语言及LOGO；实训认证底层框架
|
2017-05-27 14:21:31 +08:00 |
|
daiao
|
684777fa10
|
缺陷
|
2017-05-27 11:25:56 +08:00 |
|
cxt
|
dfb8e6f576
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/settings.html.erb
|
2017-05-27 10:32:17 +08:00 |
|
daiao
|
b050ebc2e8
|
班级模块整体功能完善
|
2017-05-27 10:27:11 +08:00 |
|
cxt
|
06e9e7f157
|
发布作业但是没有为每个学生创建一条空记录
|
2017-05-27 09:58:52 +08:00 |
|
cxt
|
c9205eb1ea
|
修改资料的安全设置中，手机绑定时对于已绑定的手机号显示样式错位
|
2017-05-26 16:15:52 +08:00 |
|
huang
|
128e24711d
|
用户认证底层结构
|
2017-05-26 11:23:32 +08:00 |
|
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 |