ychao_1983
|
f44d67cf7b
|
api 接口
|
3 years ago |
zouap
|
9f86b3bc3c
|
Merge remote-tracking branch 'origin/V20220926' into zouap
|
3 years ago |
ychao_1983
|
21b3371c35
|
表单报错不显示数据集
|
3 years ago |
zouap
|
1484a10c0e
|
Merge remote-tracking branch 'origin/V20220926' into zouap
|
3 years ago |
zhoupzh
|
4ffa5c94c8
|
解决冲突
|
3 years ago |
liuzx
|
313a176a65
|
merge
|
3 years ago |
zouap
|
f160f45f4d
|
Merge remote-tracking branch 'origin/V20220926' into zouap
|
3 years ago |
ychao_1983
|
e54de5eb15
|
提交代码
|
3 years ago |
liuzx
|
a1887d2719
|
Merge remote-tracking branch 'origin/V20220926' into fix-2069
|
3 years ago |
chenyifan01
|
683b8bc066
|
Merge remote-tracking branch 'origin/V20220908' into point-v2
|
3 years ago |
chenyifan01
|
c16e277ecd
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
|
3 years ago |
liuzx
|
ba34ade887
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
3 years ago |
zouap
|
9c0cd1c091
|
首页国际化修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
liuzx
|
fefb042477
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
3 years ago |
zouap
|
a51f736543
|
老拉新需求
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
3 years ago |
chenyifan01
|
8c3064b85f
|
#2805
update
|
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 |
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 |
chenyifan01
|
03b3efe777
|
#2701
update grampus spec
|
3 years ago |
liuzx
|
621f195070
|
add rediskey stop same task
|
3 years ago |
chenyifan01
|
2898c40fcc
|
#2701
update
|
3 years ago |
ychao_1983
|
630910604a
|
merge
|
3 years ago |
chenyifan01
|
170cbacbf4
|
#2701
update
|
3 years ago |
liuzx
|
b7d5d2f750
|
fix two same task
|
3 years ago |
liuzx
|
6896276b44
|
redis to lock tasks
|
3 years ago |
ychao_1983
|
a1c59d0a8f
|
提交代码
|
3 years ago |
chenyifan01
|
b897791dec
|
#2712
fix bug
|
3 years ago |
chenyifan01
|
295b46c3c4
|
#2631
fix bug
|
3 years ago |
chenyifan01
|
a854693c8a
|
#2624
update
|
3 years ago |
chenyifan01
|
892e126a2b
|
#2624
update
|
3 years ago |
chenyifan01
|
879d29594c
|
#2631
add cloudbrain task stop template msg
|
3 years ago |
liuzx
|
467c8eaa36
|
fix-1968
|
3 years ago |
chenyifan01
|
88cee1d1d1
|
#2479
update
|
3 years ago |
chenyifan01
|
132030bc04
|
#2479
update
|
3 years ago |
chenyifan01
|
aa631ec99a
|
#2479
update wechat template msg
|
3 years ago |
chenyifan01
|
cf47b1241a
|
#2479
add wechat template msg
|
3 years ago |
ychao_1983
|
42f11142f7
|
提交代码
|
3 years ago |
ychao_1983
|
4957ecadcb
|
merger
|
3 years ago |
chenyifan01
|
64dcabedda
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# routers/routes/routes.go
# webpack.config.js
# webpack_pro.config.js
|
3 years ago |
chenshihai
|
e19b70fc71
|
注册时加同意相关协议限制
|
3 years ago |
ychao_1983
|
b1e95c666f
|
Merge branch 'V20220718' into phone
|
3 years ago |
ychao_1983
|
2c6f265cdd
|
提交代码
|
3 years ago |
chenyifan01
|
a4932912d1
|
Merge remote-tracking branch 'origin/V20220630' into point-v2
# Conflicts:
# models/action.go
# modules/setting/setting.go
# routers/repo/cloudbrain.go
|
3 years ago |
chenyifan01
|
42d13cef3c
|
#2225
update wechat bind rule
|
3 years ago |
chenyifan01
|
39339a29e6
|
#2225
update
|
3 years ago |
lewis
|
1a2dd0a1e8
|
Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into grampus
|
3 years ago |
chenyifan01
|
5631af8def
|
#2225
update
|
3 years ago |
chenyifan01
|
06161c0d17
|
#2225
update
|
3 years ago |
chenyifan01
|
7a3cc57f9f
|
#2225
update
|
3 years ago |