 daiao
|
7e03296bea
|
管理员只看支撑实训
|
2017-08-27 11:18:18 +08:00 |
 huang
|
57722df834
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/shixuns/_form.html.erb
|
2017-08-25 16:37:05 +08:00 |
 XuCheng642
|
d0181f80b7
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 16:25:12 +08:00 |
 cxt
|
a944456e57
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/subjects/_subject_list.html.erb
|
2017-08-25 16:13:46 +08:00 |
|
XuCheng642
|
f54453f32c
|
管理员界面新增专业
|
2017-08-25 16:11:35 +08:00 |
|
cxt
|
20b509a985
|
镜像管理的删除
|
2017-08-25 15:50:00 +08:00 |
|
huang
|
77af9910f1
|
实训新建的时候添加webssh勾选项
|
2017-08-25 14:50:15 +08:00 |
|
cxt
|
49bbd36c12
|
实训套件的改版
|
2017-08-24 20:01:34 +08:00 |
|
cxt
|
71d8fd4420
|
镜像管理相关
|
2017-08-24 17:32:05 +08:00 |
|
XuCheng642
|
0d4c234d51
|
支撑实训和新增实训页面列表的修改
|
2017-08-24 11:32:48 +08:00 |
|
daiao
|
4e7205a5a0
|
非合作成员点击TPM的任务列表，请进入TPI页面
|
2017-08-23 15:05:57 +08:00 |
|
cxt
|
78f1fd3d1d
|
增加试用申请的留言功能
|
2017-08-22 16:27:28 +08:00 |
|
cxt
|
b853f4bf16
|
镜像管理的model创建
|
2017-08-22 14:38:56 +08:00 |
|
cxt
|
0d6746b5c2
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 14:01:10 +08:00 |
|
XuCheng642
|
a47d2d8536
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 10:51:29 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
cxt
|
b4e454dc8b
|
技能标签的翻页有问题
|
2017-08-16 15:41:56 +08:00 |
|
huang
|
355ffddbd4
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:14:37 +08:00 |
|
cxt
|
a0453dadd0
|
实训关卡调整
|
2017-08-11 19:56:27 +08:00 |
|
huang
|
56f74473cb
|
解决查看game没权限的问题
|
2017-08-11 18:46:12 +08:00 |
|
huang
|
1fee1dd7f9
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-11 17:15:39 +08:00 |
|
cxt
|
139a0597d8
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/views/layouts/base_management.html.erb
app/views/managements/_class_shixuns_list.html.erb
app/views/managements/_users_authorization_list.html.erb
app/views/managements/identity_authentication.html.erb
app/views/managements/shixun_authorization.html.erb
app/views/managements/subject_authorization.html.erb
config/routes.rb
public/javascripts/edu/account.js
public/javascripts/edu/syllabus.js
|
2017-08-11 15:20:56 +08:00 |
|
huang
|
d92d4e8ee7
|
Merge branch 'develop' into dev_kubernete
Conflicts:
.idea/dataSources.xml
app/controllers/shixuns_controller.rb
|
2017-08-11 14:52:08 +08:00 |
|
XuCheng642
|
d3a67b42b2
|
超级管理员相关页面
|
2017-08-11 11:27:04 +08:00 |
|
cxt
|
aecf1ff13c
|
个人成长记录中心的数据处理
|
2017-08-10 16:09:21 +08:00 |
|
huang
|
069202b056
|
实训语言按实际语言处理
|
2017-08-10 15:31:30 +08:00 |
|
cxt
|
c22443b44f
|
个人成长中心记录功能的上线
|
2017-08-09 17:22:51 +08:00 |
|
huang
|
308b9bfe83
|
testcase中删除语言gameInfo中添加语言
|
2017-08-09 15:07:15 +08:00 |
|
huang
|
ca8635fe28
|
去掉gameInfo中environment
|
2017-08-09 15:00:52 +08:00 |
|
cxt
|
583eef8086
|
首页的技能标签
|
2017-08-09 09:01:22 +08:00 |
|
huang
|
50020ef080
|
记录每次评测结果
|
2017-08-08 16:41:14 +08:00 |
|
huang
|
80ea495849
|
output中添加query index字段区分每次评测结果
|
2017-08-08 14:25:37 +08:00 |
|
huang
|
75e33ac3a9
|
评测的一些修改
|
2017-08-08 11:08:59 +08:00 |
|
cxt
|
19a8b21b67
|
注册用户的自动留言，全部删掉
|
2017-08-07 17:00:53 +08:00 |
|
huang
|
63ce126282
|
优化中间层测试集；修改需要重置记录
|
2017-08-07 15:36:53 +08:00 |
|
huang
|
7f9de6f4ac
|
base64编码改成安全编码
|
2017-08-06 15:34:24 +08:00 |
|
daiao
|
a8891d3d4f
|
Merge branch 'dev_daiao' into develop
Conflicts:
public/stylesheets/css/edu-public.css
|
2017-08-04 14:11:26 +08:00 |
|
cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
daiao
|
7a889642c4
|
个人主页关注与粉丝页面
|
2017-08-02 10:54:39 +08:00 |
|
XuCheng642
|
a24bd77cdc
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/managements/identity_authentication.html.erb
|
2017-07-31 17:43:59 +08:00 |
|
XuCheng642
|
ca20c827f6
|
超级管理员页面
|
2017-07-31 17:41:42 +08:00 |
|
daiao
|
6e1e199079
|
实训TPM“编程任务”改为“实践任务”
|
2017-07-31 13:54:10 +08:00 |
|
cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
daiao
|
648e0548d6
|
用户单选题
|
2017-07-28 11:14:30 +08:00 |
|
daiao
|
2064dfb502
|
Merge branch 'develop' into dev_daiao
|
2017-07-27 10:27:36 +08:00 |
|
cxt
|
e9e4b7177e
|
Merge branch 'dev_xucheng' into develop
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/managements/_shixun_authorization_list.html.erb
|
2017-07-27 09:49:02 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +08:00 |
|
daiao
|
0bf70f145e
|
单选多选题的编辑/新建页面
|
2017-07-26 18:50:52 +08:00 |