From 4993f06d63bd9c02a212ea628776ea642cdbe742 Mon Sep 17 00:00:00 2001 From: avadesian Date: Tue, 28 Sep 2021 15:30:02 +0800 Subject: [PATCH 01/47] =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E8=80=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=85=B3=E8=81=94=E9=9A=90=E8=97=8F=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/user.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/models/user.go b/models/user.go index 38f699740..78ab4627a 100755 --- a/models/user.go +++ b/models/user.go @@ -1556,6 +1556,18 @@ func GetUserByActivateEmail(email string) (*User, error) { if len(users) >= 1 { return &users[0],nil }else { + // Finally, if email address is the protected email address:用户邮件地址设置为隐藏电子邮件地址 + if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) { + username := strings.TrimSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) + user := &User{LowerName: username} + has, err := ctx.e.Get(user) + if err != nil { + return nil, err + } + if has { + return user, nil + } + } return nil, errors.New("cannot find user by email") } } From fe24ad930572d7a4851bfce6a2f023f2eba3691a Mon Sep 17 00:00:00 2001 From: avadesian Date: Tue, 28 Sep 2021 16:26:19 +0800 Subject: [PATCH 02/47] patch for release V1.21.9.2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index afb2da5d9..1cb142db6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

logoAiForge - 启智AI开发协作平台

-[![release](https://img.shields.io/badge/release-1.21.10.1-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest) +[![release](https://img.shields.io/badge/release-1.21.9.2-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) From cb29d299df84d5c71eaf0bada35a2221ea25aa89 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 28 Sep 2021 18:25:22 +0800 Subject: [PATCH 03/47] fix bug #164 --- templates/repo/home.tmpl | 59 ++++- web_src/js/components/EditTopics.vue | 414 +++++++++++++++++++++++++++++++ web_src/js/index.js | 469 +++++++++++++++++++---------------- 3 files changed, 721 insertions(+), 221 deletions(-) create mode 100644 web_src/js/components/EditTopics.vue diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index b48efd498..b13022883 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -55,6 +55,40 @@ #contributorInfo > a.circular:nth-child(9n+8){ background-color: #bfd0aa; } +.vue_menu { + cursor: auto; + position: absolute; + outline: none; + top: 100%; + margin: 0em; + padding: 0em 0em; + background: #fff; + font-size: 1em; + text-shadow: none; + text-align: left; + /* -webkit-box-shadow: 0px 2px 3px 0px rgb(34 36 38 / 15%); */ + box-shadow: 0px 2px 3px 0px rgba(34, 36, 38, 0.15); + border: 1px solid rgba(34,36,38,0.15); + border-radius: 0.28571429rem; + -webkit-transition: opacity 0.1s ease; + transition: opacity 0.1s ease; + z-index: 11; + will-change: transform, opacity; + width: 100% !important; + + -webkit-animation-iteration-count: 1; + animation-iteration-count: 1; + -webkit-animation-duration: 300ms; + animation-duration: 300ms; + -webkit-animation-timing-function: ease; + animation-timing-function: ease; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; +} + + + +
{{template "repo/header" .}} @@ -62,7 +96,7 @@ {{template "base/alert" .}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} -