chenyifan01
|
9300604644
|
#2908
1.add icon upload api
2.fix bug
|
3 years ago |
chenyifan01
|
def6c11dbf
|
#2908
1.medal-> badge
2.add badge user management
3.add badge in user profile
|
3 years ago |
chenyifan01
|
9a9a6aa5e0
|
Merge remote-tracking branch 'origin/V20221019' into medal-v1
|
3 years ago |
chenyifan01
|
e6efde0bcb
|
#2908
1. add medal category api
2. add medal api(list,operate)
|
3 years ago |
zhoupzh
|
06eb513fed
|
Merge pull request '#2193 #2642 #2870 #2981' (#2980) from fix-csh into V20221019
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2980
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
35295b79c3
|
Merge branch 'V20221019' into fix-csh
|
3 years ago |
lewis
|
cc0794998a
|
Merge pull request 'fix-2940' (#2984) from fix-2940 into V20221019
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2984
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
ychao_1983
|
42a60d946c
|
fix-2940
|
3 years ago |
chenshihai
|
9b4e395322
|
#2981 【管理后台】资源管理相关页面增加横向滚动条
|
3 years ago |
chenshihai
|
c3924981f5
|
Merge remote-tracking branch 'origin/V20221019' into fix-csh
|
3 years ago |
ychao_1983
|
abb38f5ab3
|
Merge pull request 'V20220926版本合并' (#2979) from V20220926 into develop
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2979
|
3 years ago |
ychao_1983
|
f5c8b8242c
|
Merge pull request 'update point rule tmpl' (#2978) from point-v2 into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2978
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
3 years ago |
chenshihai
|
6963b0b9b7
|
Merge branch 'V20220926' into point-v2
|
3 years ago |
chenshihai
|
a42651a7d2
|
update point rule tmpl
|
3 years ago |
zouap
|
c5a39d0af3
|
Merge pull request 'fix issue' (#2977) from zouap into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2977
Reviewed-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
73fc5973b6
|
Merge branch 'V20220926' into zouap
|
3 years ago |
zhoupzh
|
d4834069bc
|
Merge branch 'zouap' of git.openi.org.cn:OpenI/aiforge into zouap
|
3 years ago |
zhoupzh
|
11652bf8cd
|
fix issue
|
3 years ago |
ychao_1983
|
7b08d1ddef
|
Merge pull request '修复积分bug' (#2975) from point-v2 into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2975
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
3 years ago |
chenshihai
|
06cf7bc967
|
Merge branch 'point-v2' of git.openi.org.cn:OpenI/aiforge into point-v2
|
3 years ago |
chenshihai
|
c6e116f3b1
|
update lang
|
3 years ago |
chenyifan01
|
932ac68f26
|
Merge branch 'V20220926' into point-v2
|
3 years ago |
chenyifan01
|
c412b6ac35
|
#2967
fix bug
|
3 years ago |
ychao_1983
|
4bae593c76
|
Merge pull request '运营看板的邀请用户分析增加自定义时间查询功能。' (#2974) from zouap into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2974
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
3 years ago |
zouap
|
af941febdc
|
Merge branch 'V20220926' into zouap
|
3 years ago |
zouap
|
1b37c8e08f
|
提交代码。解决自定义时间查询功能。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
beeaab7618
|
#2967
fix bug
|
3 years ago |
zouap
|
49e24592f4
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
5dcef74c9a
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
3db04cdaa6
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
741456b0e8
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
11ddfe89b2
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
fcf6a5e131
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
665cc4e0bb
|
#2967
add log
|
3 years ago |
zouap
|
e115f442b7
|
Merge branch 'zouap' of https://git.openi.org.cn/OpenI/aiforge into zouap
|
3 years ago |
zouap
|
821a302d90
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
2a29c980ed
|
Merge pull request 'zouap_dev' (#2973) from zouap_dev into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2973
Reviewed-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
d907a1a5a3
|
Merge branch 'V20220926' into zouap_dev
|
3 years ago |
chenshihai
|
c71a9d6102
|
update invitation page
|
3 years ago |
chenshihai
|
60cb3f8dc8
|
update invitation page
|
3 years ago |
ychao_1983
|
09f318836a
|
Merge pull request '修正GPU推理任务日志下载,解决#2970' (#2972) from zouap into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2972
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
3 years ago |
zouap
|
199619b730
|
Merge branch 'V20220926' into zouap
|
3 years ago |
zouap
|
28b182d432
|
修正GPU推理任务日志下载
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
7305d9dcfe
|
Merge pull request 'update invitation page' (#2971) from zouap_dev into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2971
Reviewed-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
d98554be4e
|
Merge branch 'V20220926' into zouap_dev
|
3 years ago |
chenshihai
|
9cf2fea915
|
update
|
3 years ago |
zhoupzh
|
3ad9bcd7ec
|
Merge pull request 'update' (#2965) from zouap_dev into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2965
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
|
3 years ago |
chenshihai
|
80e7a8c561
|
Merge branch 'V20220926' into zouap_dev
|
3 years ago |
chenshihai
|
8950d3d5fb
|
update
|
3 years ago |
zouap
|
8d05140a87
|
Merge pull request 'update copy action' (#2962) from zouap_dev into V20220926
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2962
Reviewed-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |