 cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
cxt
|
725697392e
|
自己评阅的历史记录应该可以删除，最新的不可以删除、连续评阅不成功
|
2017-06-27 15:04:34 +08:00 |
 huang
|
03c41dfd06
|
解决冲突
|
2017-06-23 12:13:35 +08:00 |
 daiao
|
e2c15578c4
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/managements_controller.rb
config/routes.rb
|
2017-06-23 11:20:15 +08:00 |
|
daiao
|
395eb0244c
|
实训预备知识增加编辑功能
|
2017-06-23 08:57:56 +08:00 |
|
daiao
|
69d5a6eafb
|
用户试用认证
|
2017-06-22 17:03:00 +08:00 |
|
huang
|
a49c741aae
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-06-22 16:22:43 +08:00 |
|
huang
|
164ac37005
|
实训的一些修改
|
2017-06-22 16:21:47 +08:00 |
|
daiao
|
6c95a2732a
|
用户授权列表
|
2017-06-22 09:31:08 +08:00 |
|
cxt
|
7dee11fe66
|
实训的流程更改
|
2017-06-21 17:26:49 +08:00 |
|
daiao
|
08b7446bd0
|
用户认证
|
2017-06-19 17:04:55 +08:00 |
|
cxt
|
c48f1ca3ef
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-16 15:19:20 +08:00 |
|
cxt
|
1aa0ce78c3
|
新版题库
|
2017-06-16 15:18:41 +08:00 |
|
huang
|
19ad680df9
|
获取任务等待数入口
|
2017-06-14 16:29:26 +08:00 |
|
huang
|
b3bac60f3f
|
实名认证
|
2017-06-09 20:35:58 +08:00 |
|
huang
|
809a580cca
|
添加我的实训功能
|
2017-06-09 16:17:31 +08:00 |
|
huang
|
a0cff38470
|
用户列表试用界面
|
2017-06-08 16:15:24 +08:00 |
|
huang
|
d888e3f140
|
热证一些修改
|
2017-06-08 11:17:29 +08:00 |
|
huang
|
777fdd369c
|
使用授权及身份认证迁移
|
2017-06-08 10:53:11 +08:00 |
|
huang
|
aaf1135e35
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-06-07 17:43:52 +08:00 |
|
huang
|
87071cacce
|
认证
|
2017-06-07 17:39:24 +08:00 |
|
huang
|
db35db4378
|
身份认证
|
2017-06-06 17:38:10 +08:00 |
|
daiao
|
9c2180c97f
|
codemirror加入自动补全功能
|
2017-06-06 14:17:07 +08:00 |
|
huang
|
dbe37b1df6
|
实训中增加过滤条件和搜索结果
|
2017-06-01 14:35:31 +08:00 |
|
cxt
|
8d0bb43e9c
|
修改密码页原始密码的验证有错
|
2017-05-27 11:15:06 +08:00 |
|
daiao
|
e904966b84
|
实训每通过一关，实训全部列表要刷新
|
2017-05-25 10:09:53 +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 |
|
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 |