 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 |
|
huang
|
65e85e7bdc
|
实训作业（未完）
|
2017-05-22 15:52:45 +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
|
7ad005d28e
|
合作者提供删除功能
|
2017-05-19 17:14:15 +08:00 |
|
huang
|
287ddf7115
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-19 16:56:31 +08:00 |
|
huang
|
f88bf9bcdb
|
实训添加合作者功能
|
2017-05-19 16:56:09 +08:00 |
|
daiao
|
3d48973cfc
|
新版身份认证审批
|
2017-05-19 14:46:45 +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
|
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
|
c56d6910bd
|
作品详情评论功能及删除功能
|
2017-05-17 18:18:00 +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
|
871051fdc1
|
解决不同版本session一致切换后登录丢失问题
|
2017-05-11 15:57:39 +08:00 |
|
huang
|
77025d0ae1
|
实训添加重置功能
|
2017-05-08 15:28:35 +08:00 |
|
cxt
|
9e04ed6a2d
|
课程的资源和题库选用到班级
|
2017-05-08 15:26:16 +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 |
|
daiao
|
9bf33e4fe3
|
查看答案扣除积分功能
|
2017-05-05 14:57:58 +08:00 |
|
huang
|
add2eeaf04
|
实训查看扣除积分后台处理
|
2017-05-04 14:47:19 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
cxt
|
e810d93491
|
课程资源库
|
2017-05-03 10:10:27 +08:00 |
|
huang
|
c477b634cb
|
实训统计列表
|
2017-05-02 17:18:34 +08:00 |
|
cxt
|
60d33cf661
|
课程首页（除课程资源库和课程题库）
|
2017-04-28 22:53:34 +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 |
|
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
|
2218a63710
|
shixun整型ID转换成8位字符串
|
2017-04-25 17:15:37 +08:00 |
|
daiao
|
476a69d38b
|
实训列表认证操作
|
2017-04-25 16:27:34 +08:00 |
|
huang
|
fd87038ebc
|
完成实训个人主页
|
2017-04-25 14:18:52 +08:00 |
|
huang
|
4cc972d3fe
|
admin提供实训认证
|
2017-04-24 17:29:38 +08:00 |
|
cxt
|
09482fea09
|
基本资料
|
2017-04-21 20:29:35 +08:00 |
|
cxt
|
046f73d2c6
|
新版个人首页
|
2017-04-20 17:17:02 +08:00 |
|
cxt
|
c49191b70f
|
Merge branch 'develop' into dev_cxt
|
2017-04-18 10:30:36 +08:00 |
|
cxt
|
6b9b1fe013
|
部门申请的后台审核
|
2017-04-14 15:36:23 +08:00 |
|
cxt
|
95911cd2ae
|
新版课程相关后台架构的搭建
|
2017-04-14 09:28:00 +08:00 |
 guange
|
5c0bb0f870
|
markdown图片上传
|
2017-04-12 21:55:33 +08:00 |
|
huang
|
81be008780
|
发布实训功能及异常处理、权限处理
|
2017-04-12 16:06:03 +08:00 |
|
cxt
|
7b977e9fcc
|
基本资料相关后台开发
|
2017-04-11 16:19:35 +08:00 |
|
huang
|
1fc92c5c88
|
first commit
|
2017-04-07 10:16:13 +08:00 |