#728 master

Merged
yangxzh1 merged 35 commits from openioctopus/octopus:master into master 1 year ago

35 Commits

Author SHA1 Message Date
  linfengjun 0bcb01296b Merge branch 'mem' into master 1 year ago
  linfengjun 5c52c0aabb golint typecheck误报 1 year ago
  linfengjun 9495e2a9f6 golint typecheck误报 1 year ago
  linfengjun 0eff716e68 Merge remote-tracking branch 'origin/master' into master 1 year ago
  linfengjun df962e218b golint 1 year ago
  linfengjun b4bd6694bc 任务监控接口内存百分比 1 year ago
  wenlong92 53b25522f5 admin:调整搜索框宽度 1 year ago
  wenlong92 4529cc8ea0 admin:机时列表调整显示列 1 year ago
  wenlong92 6abbb866ff admin:用户管理显示第三方账号 1 year ago
  wenlong92 6ddc2c4717 admin:用户机时列表-显示第三方账号及邮箱 1 year ago
  wenlong92 fa4d183ee9 Merge branch 'master' of https://git.openi.org.cn/openioctopus/octopus 1 year ago
  wenlong92 99b5737e39 admin:用户列表-创建时间修改为第三方账号;用户机时列表-搜索框下拉项鼠标悬浮显示第三方账号名称 1 year ago
  linfengjun ff55cd7566 用户列表增加第三方账号和备注搜索 1 year ago
  wakinzhang 57a7a11b19 get notebook event list support notebook id 1 year ago
  wakinzhang d7c2246fa4 add param notebookid for notebook event list 1 year ago
  wakinzhang f0dbd5f543 fix exp 1 year ago
  wakinzhang 37a9d51bf8 change monitor item 1 year ago
  denglei 63bc0b0013 Merge branch 'master' into master 1 year ago
  denglei 84755b0934 去掉fluid包 1 year ago
  denglei 3758853813 滚动条bug修复 1 year ago
  denglei 38535a4812 新增分布式锁任务bug修复 1 year ago
  张加远 02f02729d4 merge release 4.2.7 fpga 1 year ago
  linfengjun 74a1a9ff53 Merge remote-tracking branch 'origin/master' into master 1 year ago
  linfengjun 9f139e1558 notebook启动时插入influxdb出错时不回滚数据 1 year ago
  denglei b0ad525e38 登录问题修复 1 year ago
  张加远 2cc11a4441 support xilinx fpga 1 year ago
  yangxzh1 181cd2f00c Merge pull request '寒武纪节点监控指标项:节点占用率问题修复' (#681) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 eb1d73edf7 Merge pull request 'release-v4.2.6' (#680) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 88cf29f9c3 Merge pull request '修改minio用户唯一索引报错' (#678) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 293d2f49eb Merge pull request 'release-v4.2.6' (#677) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  yangxzh1 cc8bb4f311 Merge pull request '修改创建用户唯一索引报错' (#675) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 ccbdb24f6b Merge pull request '#673 #672' (#674) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 2f0856b2dc Merge pull request 'release-v4.2.6' (#669) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  liwei03 ce7bac1be4 Merge pull request 'release-v4.2.6' (#667) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago
  yangxzh1 c4396cb845 Merge pull request 'release-v4.2.6' (#662) from openioctopus/octopus:release-v4.2.6 into release-v4.2.6 1 year ago