#100 master5.20

Merged
liwei03 merged 90 commits from OpenI/octopus:master into master 1 year ago

90 Commits

Author SHA1 Message Date
  liwei03 f7d8b8103e Merge pull request '#324 #459' (#477) from openioctopus/octopus:master into master 1 year ago
  linfengjun 71a2b9db8f Merge remote-tracking branch 'origin/master' into master 1 year ago
  linfengjun 85a136e83f golint 1 year ago
  denglei 4431d2f161 资源规格去掉分页 1 year ago
  linfj 6c83936aa8 Merge pull request 'ftp' (#79) from ftp into master 1 year ago
  linfengjun d0a49660ba 修改配置 1 year ago
  wenlong92 37e85e5197 删除管理端无用图标 2 years ago
  wenlong92 2a8c6343a7 删除用户端无用图标 2 years ago
  wenlong92 19a0c89d34 管理端图标名称更改 2 years ago
  wenlong92 630572f73c 用户端图标名称更改 2 years ago
  wenlong92 a11fdee516 '设置'图标修改 2 years ago
  liwenlong 2e0e0c61bb Merge pull request 'master' (#78) from master into ftp 2 years ago
  wenlong92 3ba08591be Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus 2 years ago
  wenlong92 0fd52c4841 统一管理端图标 2 years ago
  wenlong92 93fd993910 统一用户端图标 2 years ago
  wenlong92 c52ca955ed update 2 years ago
  wenlong92 682b381ae0 update 2 years ago
  wenlong92 3fcf83ae35 ftp mount 2 years ago
  wenlong92 d56b6660b4 merge conflict 2 years ago
  wenlong92 a0ea3efe14 ftpUserName唯一 2 years ago
  linfj 31351ba502 Merge pull request 'ftp' (#77) from ftp into master 2 years ago
  wenlong92 640e01e766 merge conflict 2 years ago
  wenlong92 555535d343 ftp页面获取ftpUserName字段展示 2 years ago
  wenlong92 259379c189 userInfo添加ftpUserName字段 2 years ago
  linfengjun 377a3af908 Merge remote-tracking branch 'upstream/release-v4.1.1' into master 2 years ago
  wenlong92 9ae2c9f746 Merge branch 'ftp' of https://git.openi.org.cn/openioctopus/octopus into ftp 2 years ago
  wenlong92 3a2dc85c16 sftp注册功能 2 years ago
  liwenlong 108b51832d Merge pull request 'master' (#76) from master into ftp 2 years ago
  yangxzh1 be2947cd92 Merge pull request '资源规格报错' (#474) from openioctopus/octopus:master into master 2 years ago
  linfengjun 7545fb10bb 资源规格报错 2 years ago
  wenlong92 65f1552f6f sftp注册功能 2 years ago
  denglei 8f4fbf1001 机时错误 2 years ago
  liwei03 c6265724ab Merge pull request 'master' (#470) from openioctopus/octopus:master into master 2 years ago
  denglei ba2f6b3ed9 布局 2 years ago
  denglei b67de877e6 群组修改 2 years ago
  denglei 23a161a658 群组修改 2 years ago
  linfj e06fa8f2e5 Merge pull request '去除后端当前space' (#75) from grampus-new into master 2 years ago
  linfengjun 8b8698526e 冲突 2 years ago
  linfengjun 262e67f703 Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus into grampus-new 2 years ago
  denglei 43f0beb0a7 群组修改 2 years ago
  wenlong92 9222b04ae9 sftp注册功能 2 years ago
  denglei e6d1dd3bc6 群组修改 2 years ago
  denglei 617a4b68aa 模型部署提示语 2 years ago
  yangxzh1 8a15c3dec3 Merge pull request '登录接口增加初始化k8s ns、pv、pvc' (#467) from openioctopus/octopus:release-v4.1.1 into release-v4.1.1 2 years ago
  linfengjun fc922f9c79 服务端去除当前space 2 years ago
  linfengjun c7efdf87f3 登录接口增加初始化k8s ns、pv、pvc 2 years ago
  linfengjun 31e5605fe7 服务端去除当前space 2 years ago
  linfengjun 700be0a8c7 修改配置 2 years ago
  linfengjun 7198f8aeee 训练日志 2 years ago
  linfengjun 6998ade0a3 sftp部署 2 years ago
  linfengjun 50d458aabe sftp部署 2 years ago
  denglei 12c3011c4b Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus 2 years ago
  denglei ba88ae7273 模型部署提示语 2 years ago
  xulf 420eb943ea Merge remote-tracking branch 'origin/master' 2 years ago
  xulf 6b32b44730 修复一个云脑账号被多个OA绑定以及用户机时初始化问题 2 years ago
  denglei 78b1e076a8 模型部署提示语 2 years ago
  linfengjun 53407da07b sftp部署 2 years ago
  linfengjun 8a6aa69f3b Merge remote-tracking branch 'origin/ftp' into ftp 2 years ago
  linfengjun fb54952ff1 唯一索引 2 years ago
  linfengjun 7558116aff 日志 2 years ago
  wenlong92 7410db6e41 update 2 years ago
  wenlong92 a07fe293c5 merge master 2 years ago
  denglei 39cc709b87 第三方登录优化 2 years ago
  wenlong92 08bfb415ea ftp前端页面 2 years ago
  yangxzh1 295aaaf8ac Merge pull request 'master' (#462) from openioctopus/octopus:master into master 2 years ago
  denglei 2be8818651 Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus 2 years ago
  denglei bec6a59859 百分比显示错误 2 years ago
  Liaoweisheng 78304b8382 Revert "test gateway" 2 years ago
  Liaoweisheng 4420d3ed74 test gateway 2 years ago
  Liaoweisheng 8fe4e772ce Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus 2 years ago
  Liaoweisheng 053ee76c86 update pytorch server verison 2 years ago
  wenlong92 7d1b19bc8e ftp前端页面 2 years ago
  yangxzh1 70cda326d0 Merge pull request '#454 #456' (#458) from openioctopus/octopus:master into master 2 years ago
  linfengjun 1230e232bc sftp 2 years ago
  linfengjun bc95d5f944 conflict 2 years ago
  linfengjun 0331431bc5 conflict 2 years ago
  linfengjun 40674cba1c Merge remote-tracking branch 'origin/master' into ftp 2 years ago
  linfengjun 86233c8f82 Merge branch 'grampus-new' into master 2 years ago
  linfengjun 320cb21805 登录过期时间 2 years ago
  linfengjun 35746918b4 增加imageUrl 2 years ago
  linfengjun 02e90dbee7 去掉登录挤退 2 years ago
  linfengjun fa65fb87f1 openaiserver接口增加imageUrl参数、数据集等参数改为选填 2 years ago
  linfengjun f570bd3bc7 sftp部署 2 years ago
  linfengjun d22a3f1a26 sftpgo部署 2 years ago
  linfengjun d54cc910eb sftpgo部署 2 years ago
  linfengjun 45ddede580 sftpgo部署 2 years ago
  linfengjun 444e70ca2d sftpgo部署 2 years ago
  linfengjun 0312cbe7bb ftp创建和删除虚拟目录 2 years ago
  linfengjun f6737d9011 Merge remote-tracking branch 'origin/master' into ftp 2 years ago
  liutension d7bac7e772 octopus and sftpgo 2 years ago