 cxt
|
4bc1fae86e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 09:44:52 +08:00 |
 huang
|
05052cc20b
|
版本库地址问题
|
2017-06-30 09:43:57 +08:00 |
|
cxt
|
c490420064
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 09:26:52 +08:00 |
|
huang
|
84ca57c88a
|
修改版本库地址问题
|
2017-06-30 09:25:17 +08:00 |
|
cxt
|
31898cbc4f
|
分组作业评阅中没有显示其他组员的名字，label需要替换新样式
|
2017-06-29 18:57:51 +08:00 |
|
huang
|
45099912b4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-29 15:52:57 +08:00 |
|
huang
|
f301d6a5bc
|
git地址改成内网地址
|
2017-06-29 15:51:49 +08:00 |
|
cxt
|
fb12411dc4
|
实训作业动态调整
|
2017-06-29 14:18:16 +08:00 |
|
cxt
|
f7cb691c0f
|
申请发布按钮问题
|
2017-06-28 17:24:11 +08:00 |
|
cxt
|
f6bd9846ec
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-28 15:23:36 +08:00 |
|
cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
huang
|
efc5153059
|
解决发布实训取消实训这个阶段中实训更改状态记录，便于后续判断是否需要重置脚本
|
2017-06-26 18:20:28 +08:00 |
|
huang
|
89c2fe23d5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-26 14:06:03 +08:00 |
|
huang
|
be17994e7a
|
添加经验值功能
|
2017-06-26 14:05:39 +08:00 |
|
cxt
|
5cd7e4fe18
|
重置实训时新开了一个空白页
|
2017-06-23 18:16:55 +08:00 |
|
cxt
|
81c33117dc
|
课程资源可以操作就可以下载，但是现在只可以进行发送但是不能下载
|
2017-06-23 17:14:47 +08:00 |
|
huang
|
b2b4b8cd32
|
删除实训的时候一并删除shixun_modify记录
|
2017-06-23 16:14:20 +08:00 |
|
cxt
|
a9d556dc60
|
实训重置弹框
|
2017-06-23 15:13:45 +08:00 |
|
cxt
|
3970efa0fd
|
实训重置
|
2017-06-23 14:33:18 +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 |
|
huang
|
a99361e89a
|
开始实训的时候记录默认代开文件初始代码
|
2017-06-23 10:20:34 +08:00 |
|
huang
|
1a4170d6db
|
修改更改记录方法
|
2017-06-22 20:11:30 +08:00 |
|
huang
|
568a7eb218
|
shixun开启的一些问题
|
2017-06-22 17:37:27 +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 |
|
cxt
|
0f804a7588
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
app/controllers/shixuns_controller.rb
app/models/shixun.rb
|
2017-06-22 09:52:20 +08:00 |
|
daiao
|
faf2a1300b
|
Merge branch 'develop' into dev_daiao
|
2017-06-22 09:32:38 +08:00 |
|
daiao
|
6c95a2732a
|
用户授权列表
|
2017-06-22 09:31:08 +08:00 |
|
cxt
|
7dee11fe66
|
实训的流程更改
|
2017-06-21 17:26:49 +08:00 |
|
huang
|
e07772f20a
|
解决base64编码空格问题；版本文件初始化
|
2017-06-21 16:38:50 +08:00 |
|
huang
|
08dbaf1c18
|
实训发布生测测试用例代码封装
|
2017-06-19 17:01:04 +08:00 |
|
cxt
|
c81eac1f44
|
已结束的作业不允许补交作品
|
2017-06-16 16:29:14 +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 |
|
cxt
|
72369ff2fd
|
班级作业的设置和列表变更
|
2017-06-14 15:01:44 +08:00 |
|
huang
|
74e2ef9429
|
添加实训评测任务
|
2017-06-13 16:03:38 +08:00 |
|
huang
|
f0823e7eb7
|
实名认证方式修改
|
2017-06-11 15:53:04 +08:00 |
|
huang
|
8f40d7022a
|
修复登录等问题
|
2017-06-11 15:45:54 +08:00 |
|
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 |
|
cxt
|
db01677247
|
学生角色时班级头部的分班数样式调整
|
2017-06-09 09:26:09 +08:00 |
|
huang
|
a0cff38470
|
用户列表试用界面
|
2017-06-08 16:15:24 +08:00 |
|
cxt
|
4bff7c7d68
|
班级动态页面的提交作品按钮导致页面样式错乱
|
2017-06-08 16:05:23 +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 |
|
cxt
|
0eae7f43e6
|
作品列表页面的查看作品应该跳转到作品内容页面（同查看操作），目前只是刷新列表页面
|
2017-06-06 14:45:24 +08:00 |
|
cxt
|
cfe48f6295
|
班级动态中作业标签应该与作业列表中的一致
|
2017-06-06 14:41:57 +08:00 |
|
cxt
|
fa81fee727
|
作品列表无论是否提交应该都可以评阅
|
2017-06-02 20:04:49 +08:00 |
|
cxt
|
28c72c7d23
|
身份认证的图像更换
|
2017-06-02 15:05:06 +08:00 |