 cxt
|
a513ad0b5a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 17:03:41 +08:00 |
|
cxt
|
4068a9e952
|
班级作业从题库选用，都选后导入的是多个同一作业
|
2017-07-14 15:53:26 +08:00 |
|
cxt
|
60eab2a755
|
用户试用被拒绝后，重新申请可以一直申请，且超级管理员审批页面没有收到申请信息、试用授权的审批页面，点击同意后没有刷新
|
2017-07-14 15:41:31 +08:00 |
 daiao
|
c7999cb682
|
缺陷修复
|
2017-07-14 15:39:27 +08:00 |
|
daiao
|
3e4f551283
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 15:04:25 +08:00 |
|
daiao
|
379252f165
|
webssh
|
2017-07-14 15:03:08 +08:00 |
|
cxt
|
816b839d01
|
测试版的课程实训报500
|
2017-07-14 14:03:14 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
cxt
|
73fabce2bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 09:58:42 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
 huang
|
e4dec24e90
|
0
|
2017-07-13 17:32:29 +08:00 |
|
huang
|
c5ebdbde41
|
解决版本库历史记录分页bug（gitlab数据分页不一致的情况下会报错）
|
2017-07-13 17:20:16 +08:00 |
|
huang
|
d93bd9388e
|
版本库历史记录分页功能
|
2017-07-13 16:41:30 +08:00 |
|
huang
|
b1e3f14050
|
修复版本库500问题
|
2017-07-13 16:16:12 +08:00 |
|
daiao
|
ca7d812266
|
Merge branch 'develop' into dev_daiao
|
2017-07-13 15:26:47 +08:00 |
|
cxt
|
6c527a7239
|
实训首页显示所有状态的实训，但是未发布的显示“编辑中，无法访问”
|
2017-07-13 10:36:09 +08:00 |
|
cxt
|
eed8f4845f
|
课程实训页面调整
|
2017-07-13 10:16:44 +08:00 |
|
daiao
|
49277f39a1
|
超级管理员的实训菜单“已关闭实训
|
2017-07-13 09:48:17 +08:00 |
|
cxt
|
0ebf73860e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/layouts/_unlogin_header.html.erb
|
2017-07-13 09:22:26 +08:00 |
|
cxt
|
65a2355730
|
课程实训
|
2017-07-13 09:20:25 +08:00 |
|
daiao
|
f8095f5bcc
|
超级管理员的实训菜单“已发布实训”
|
2017-07-12 16:23:57 +08:00 |
|
huang
|
0de42167ed
|
Job的删除放在后台处理
|
2017-07-12 14:03:12 +08:00 |
|
cxt
|
ef18ae9675
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-11 17:16:45 +08:00 |
|
cxt
|
e6a3d8d455
|
课程实训
|
2017-07-11 17:16:28 +08:00 |
|
daiao
|
429127fc47
|
顶部导航栏的搜索结果显示优化
|
2017-07-11 15:08:28 +08:00 |
|
cxt
|
57812cecd4
|
用户资料页出现不应有的试用申请提示
|
2017-07-11 15:02:02 +08:00 |
|
cxt
|
55e4ac5381
|
消息机制现在走的是留言，请在头像下拉菜单的留言右侧增加显示新消息的提示
|
2017-07-11 14:42:18 +08:00 |
|
cxt
|
42e9fa842c
|
班级作业的题库选用功能上线
|
2017-07-10 17:16:40 +08:00 |
|
daiao
|
096b44e350
|
管理员实训列表
|
2017-07-10 16:41:15 +08:00 |
|
daiao
|
c62b7a1b13
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_repository.html.erb
|
2017-07-10 15:15:17 +08:00 |
|
daiao
|
2a2dd216b7
|
webssh+管理员实训页面
|
2017-07-10 15:13:11 +08:00 |
|
cxt
|
348d0fb14e
|
作品列表需要按50人来进行分页
|
2017-07-10 11:06:54 +08:00 |
|
huang
|
e6b296142a
|
解决重置代码弹出错误问题
|
2017-07-07 22:36:48 +08:00 |
|
cxt
|
3f276b8f31
|
实训合并
|
2017-07-07 18:28:08 +08:00 |
|
cxt
|
47646c6259
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-07 18:25:59 +08:00 |
|
cxt
|
4f3bc9a2e4
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/helpers/application_helper.rb
|
2017-07-07 18:25:44 +08:00 |
|
cxt
|
1f85875f9d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/index.html.erb
|
2017-07-07 18:23:20 +08:00 |
|
daiao
|
7e2de0d3c2
|
webssh
|
2017-07-07 17:27:36 +08:00 |
|
huang
|
535e8b7da9
|
管理员界面添加webssh选中功能
|
2017-07-07 17:22:50 +08:00 |
|
huang
|
5017464d68
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-07 16:27:00 +08:00 |
|
cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |
|
huang
|
f0bfcd9a16
|
管理员界面添加实训功能
|
2017-07-07 16:02:55 +08:00 |
|
huang
|
65302fbc1d
|
Merge branch 'develop' into dev_cs
|
2017-07-07 15:43:49 +08:00 |
|
huang
|
d4c5d8b10e
|
admin 添加认证
|
2017-07-07 15:41:02 +08:00 |
|
huang
|
f4467bc222
|
webssh添加gameid关联参数
|
2017-07-07 14:12:40 +08:00 |
|
huang
|
a75f477797
|
合作者拥有编写实训代码的权限
|
2017-07-07 11:23:15 +08:00 |
|
huang
|
0a65ebb1d0
|
版本库添加在线编辑功能
|
2017-07-07 11:04:53 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
daiao
|
788fa96b14
|
wenssh
|
2017-07-06 16:13:46 +08:00 |
|
huang
|
cd67988902
|
tpi添加连接webssh及断开webssh接口
|
2017-07-06 11:32:13 +08:00 |