chenshihai
|
1c541adba0
|
point use
|
3 years ago |
chenyifan01
|
b3f02877f1
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
# Conflicts:
# models/models.go
# modules/cloudbrain/resty.go
# modules/cron/tasks_basic.go
# modules/notification/base/notifier.go
# modules/notification/base/null.go
# modules/notification/notification.go
# modules/setting/setting.go
# options/locale/locale_en-US.ini
# options/locale/locale_zh-CN.ini
# package-lock.json
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/benchmark/new.tmpl
# templates/repo/cloudbrain/new.tmpl
# templates/repo/cloudbrain/trainjob/new.tmpl
# templates/repo/modelarts/inferencejob/new.tmpl
# templates/repo/modelarts/notebook/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
# web_src/vuepages/components/BaseDialog.vue
# web_src/vuepages/const/index.js
# web_src/vuepages/langs/config/en-US.js
# web_src/vuepages/langs/config/zh-CN.js
# webpack_pro.config.js
|
3 years ago |
chenshihai
|
817ceb8d6c
|
update dir tips
|
3 years ago |
chenyifan01
|
1f20f81235
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# models/cloudbrain.go
# models/models.go
# modules/cron/tasks_basic.go
# modules/modelarts/modelarts.go
# routers/repo/grampus.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/inference/new.tmpl
# templates/repo/cloudbrain/trainjob/new.tmpl
# templates/repo/grampus/trainjob/gpu/new.tmpl
# templates/repo/grampus/trainjob/npu/new.tmpl
# templates/repo/modelarts/inferencejob/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
|
3 years ago |
zhoupzh
|
e9a64bc67b
|
Merge branch 'V20220830' into fix-2764
|
3 years ago |
zhoupzh
|
e222c4f5dd
|
中英文修改
|
3 years ago |
zouap
|
c33167b845
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zouap
|
7d1d1a39df
|
国际化信息提交。#2760
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
251510a99a
|
fix issue
|
3 years ago |
zouap
|
c66fe6a23c
|
国际化信息提交。#2760
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
861ff56ea7
|
国际化信息提交。#2760
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
813c7e481e
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
0e12257649
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
85f37b4e9b
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
584acf4d9a
|
specs useage
|
3 years ago |
chenshihai
|
918c979c4f
|
specs useage
|
3 years ago |
zouap
|
8113781230
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
ddfc0c4aef
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
ff7ab3ea2b
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
96e2a14c6c
|
specs useage
|
3 years ago |
zouap
|
0387e181f4
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
c273858fc0
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
c9012804b5
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
56ca9b6a66
|
specs useage
|
3 years ago |
zouap
|
dc74629651
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
01d19221ea
|
国际化信息提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
4cc264149b
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zhoupzh
|
19a6ff20e4
|
Merge branch 'V20220830' into fix-2392
|
3 years ago |
zhoupzh
|
489e1735e1
|
解决关联数据集的细节问题
|
3 years ago |
chenshihai
|
761059a49f
|
specs useage
|
3 years ago |
chenshihai
|
77dc319ab8
|
specs useage
|
3 years ago |
zouap
|
883f8cb653
|
修复冲突。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
309b84670b
|
国际化修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
85a3788cc2
|
Merge branch 'V20220830' into fix-2745
|
3 years ago |
zhoupzh
|
840ff47362
|
fix issue
|
3 years ago |
zouap
|
22cf0fa2c1
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zouap
|
5f0a374688
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
9e623b1eaf
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
c922729f42
|
fix issue
|
3 years ago |
zhoupzh
|
f2c57a5159
|
Merge branch 'fix-2392' of git.openi.org.cn:OpenI/aiforge into fix-2392
|
3 years ago |
zhoupzh
|
da49d596ab
|
fix issue
|
3 years ago |
ychao_1983
|
630910604a
|
merge
|
3 years ago |
zhoupzh
|
5a90cffcf9
|
fix issue
|
3 years ago |
lewis
|
8d8b5b8901
|
Merge pull request '解决#2647及相关国际化修改。' (#2732) from zouap into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2732
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
chenshihai
|
28fd24a5e0
|
Merge branch 'V20220830' into fix-2546
|
3 years ago |
zhoupzh
|
1f2bf0fb4d
|
Merge branch 'fix-2546' of git.openi.org.cn:OpenI/aiforge into fix-2546
|
3 years ago |
zhoupzh
|
7931fb6417
|
fix issue
|
3 years ago |
zhoupzh
|
f5b8012364
|
Merge branch 'V20220830' into fix-2628
|
3 years ago |
zhoupzh
|
744d89fca5
|
fix issue
|
3 years ago |
zouap
|
41bfe85e7b
|
修改国际化信息。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |