 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 |
 daiao
|
6c3b482869
|
样式调整
|
2017-06-09 16:04:04 +08:00 |
|
huang
|
87071cacce
|
认证
|
2017-06-07 17:39:24 +08:00 |
|
huang
|
32b725e47a
|
迁移出错问题
|
2017-06-02 16:44:40 +08:00 |
 cxt
|
15345d93bd
|
作品列表的多条件筛选
|
2017-06-02 14:27:12 +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
|
b050ebc2e8
|
班级模块整体功能完善
|
2017-05-27 10:27:11 +08:00 |
|
huang
|
128e24711d
|
用户认证底层结构
|
2017-05-26 11:23:32 +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 |
|
huang
|
c9593f7d17
|
实训作业
|
2017-05-22 21:31:28 +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 |
|
huang
|
8dd6b6ffe4
|
实训预备知识独立数据迁移及数据读取处理
|
2017-05-18 14:50:39 +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
|
f0f8228a91
|
重新评测处理方式修改
|
2017-05-15 16:37:46 +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 |
|
daiao
|
f491b340a2
|
实训tpi的评测loading效果做成codefight的评测一致
|
2017-05-11 10:26:13 +08:00 |
|
huang
|
2d0a2f8a89
|
提供一直可以评测功能
|
2017-05-10 10:43:23 +08:00 |
|
huang
|
5ea6c193f6
|
允许实训创建者参加挑战
|
2017-05-08 16:36:08 +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
|
6fe571cc99
|
课程资源库和课程题库
|
2017-05-05 19:36:32 +08:00 |
|
huang
|
6e52d9128b
|
评测显示结果更正。代码重构
|
2017-05-05 16:14:35 +08:00 |
|
huang
|
ea0d90a383
|
实训积分系统
|
2017-05-04 17:29:00 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
huang
|
eaed13dbc8
|
积分初始数据迁移
|
2017-05-04 13:56:43 +08:00 |
|
huang
|
b8e0da5eaa
|
完善资料积分数据迁移
|
2017-05-03 17:08:46 +08:00 |
|
huang
|
1aee70dc02
|
完成用户注册积分奖励
|
2017-05-03 15:23:01 +08:00 |
|
cxt
|
e810d93491
|
课程资源库
|
2017-05-03 10:10:27 +08:00 |
|
huang
|
a17a1f8910
|
添加执行文件选项
|
2017-04-27 11:21:47 +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 |
|
huang
|
b3c803341f
|
url重定义
|
2017-04-26 14:20:07 +08:00 |
|
daiao
|
2f14a2e6ca
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-04-26 11:10:20 +08:00 |
|
daiao
|
fe9ebbb6d6
|
实训首页的热度排序与时间排序
|
2017-04-26 11:10:01 +08:00 |
|
huang
|
c98d8cdf1d
|
myshixun中id转换
|
2017-04-26 10:19:04 +08:00 |
|
daiao
|
94b7a89e7b
|
Merge branch 'develop' into dev_huang
Conflicts:
app/views/challenges/_content_list.html.erb
app/views/shixuns/index.html.erb
|
2017-04-26 09:48:13 +08:00 |
|
huang
|
bf5416fe4b
|
添加identifier
|
2017-04-26 09:39:27 +08:00 |
|
huang
|
2218a63710
|
shixun整型ID转换成8位字符串
|
2017-04-25 17:15:37 +08:00 |
|
daiao
|
476a69d38b
|
实训列表认证操作
|
2017-04-25 16:27:34 +08:00 |
|
cxt
|
9e7624f90a
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/css/bigdata-common.css
|
2017-04-21 22:10:17 +08:00 |
 chenglong
|
8e2cce8fd2
|
静态页面的修改
|
2017-04-21 20:06:54 +08:00 |
|
huang
|
5bcc22a8cf
|
修改评测结果结构
|
2017-04-20 17:19:18 +08:00 |
|
cxt
|
046f73d2c6
|
新版个人首页
|
2017-04-20 17:17:02 +08:00 |