 huang
|
0076291c9d
|
样式问题
|
2017-08-27 11:46:55 +08:00 |
 cxt
|
07b2c0319e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:21:02 +08:00 |
|
cxt
|
94a4bd8001
|
镜像管理的调整
|
2017-08-25 20:19:32 +08:00 |
 daiao
|
efab84a950
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 19:56:33 +08:00 |
|
daiao
|
ef0da2ebf6
|
修改上传附件删除按钮的位置
|
2017-08-25 19:56:17 +08:00 |
 caishi
|
3ddfd6cc24
|
Merge branch 'develop' into dev_cs
|
2017-08-25 17:05:25 +08:00 |
|
caishi
|
03a7b645b8
|
issues修改
|
2017-08-25 17:03:18 +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 |
|
cxt
|
49bbd36c12
|
实训套件的改版
|
2017-08-24 20:01:34 +08:00 |
|
huang
|
2c7fe618bb
|
解决用户没有提交代码依旧能开启挑战的问题
|
2017-08-24 17:50:29 +08:00 |
|
daiao
|
f16d71dd63
|
实训正在评测中，然后关掉实训后tpm就显示“评测中”，应该还是正在挑战中
|
2017-08-22 16:39:09 +08:00 |
|
cxt
|
c5703e742e
|
分组作业成员也可以修改作业
|
2017-08-22 10:13:02 +08:00 |
|
huang
|
ccc77ef427
|
添加机器学习镜像已经跳过gitlab hook登录验证
|
2017-08-21 15:50:18 +08:00 |
|
huang
|
771863e009
|
修改实训post中间层uri转换方式
|
2017-08-13 10:48:05 +08:00 |
|
huang
|
779c805c5d
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 17:25:56 +08:00 |
|
cxt
|
0a7e785a1d
|
金币重复加
|
2017-08-11 17:21:29 +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 |
|
huang
|
f98ed3c238
|
解决不同Ruby版本Base64解码问题
|
2017-08-10 14:33:34 +08:00 |
|
huang
|
d27c5cb2a3
|
调试开启实训
|
2017-08-10 10:00:11 +08:00 |
|
cxt
|
fe94c267c5
|
超级管理员的试用授权列表显示的状态信息变更
|
2017-08-07 17:17:47 +08:00 |
|
huang
|
63ce126282
|
优化中间层测试集；修改需要重置记录
|
2017-08-07 15:36:53 +08:00 |
|
huang
|
b3b1e222ef
|
实训修改产生更新信息方法修改（添加触发异常机制）
|
2017-08-07 15:08:43 +08:00 |
|
huang
|
7f9de6f4ac
|
base64编码改成安全编码
|
2017-08-06 15:34:24 +08:00 |
|
huang
|
d1432495ec
|
Merge branch 'develop' into dev_kubernete
|
2017-08-04 20:42:16 +08:00 |
|
daiao
|
304ccdfceb
|
html评测应该进入“测试结果”tab刷新等待显
|
2017-08-04 19:21:27 +08:00 |
|
daiao
|
ff40ee71e9
|
创建实训
|
2017-08-04 17:31:02 +08:00 |
|
daiao
|
9982911e2c
|
实训新建了选择任务，模拟实战没有重置
|
2017-08-04 17:28:53 +08:00 |
|
daiao
|
ba60f9e694
|
实训TPI加入点赞与踩的数据统计
|
2017-08-04 16:10:42 +08:00 |
|
daiao
|
2881942313
|
python语言分环境
|
2017-08-04 15:10:43 +08:00 |
|
huang
|
04c142698f
|
kubernetes新架构下的一些修改
|
2017-08-04 14:19:22 +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 |
|
daiao
|
25f22ad8fd
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
app/helpers/application_helper.rb
|
2017-08-04 11:04:47 +08:00 |
|
daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
huang
|
4e0dfe4952
|
Merge branch 'develop' into huang_k8s
|
2017-08-01 09:40:47 +08:00 |
|
cxt
|
d67b02b157
|
Merge branch 'develop' into dev_cxt
|
2017-08-01 09:32:41 +08:00 |
|
huang
|
fb0e141510
|
添加Python版本
|
2017-08-01 09:28:02 +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 |
|
cxt
|
a8d44d9574
|
超级管理员的title修改
|
2017-07-31 17:39:03 +08:00 |
|
cxt
|
a7ee29dfa8
|
点击头部导航栏的搜索后浏览器title显示的是真实姓名，已经设置了隐藏真实姓名
|
2017-07-31 14:20:55 +08:00 |
|
huang
|
43f8976e59
|
以太坊英文修改
|
2017-07-28 16:48:24 +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 |
|
caishi
|
5188fb7059
|
个人主页
|
2017-07-26 21:16:45 +08:00 |
|
huang
|
0781f11782
|
实训的一些修改
|
2017-07-26 20:41:09 +08:00 |
|
cxt
|
faff4c1960
|
Merge branch 'dev_cxt' into dev_cs
|
2017-07-26 14:43:19 +08:00 |
|
cxt
|
f1087cb441
|
实训套件模块的改版
|
2017-07-26 14:42:20 +08:00 |