Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

Merge branch 'dev' into test

LinkinStarsc450e7cd54d3
diff --cc internal/service/user_admin/user_backyard.go
index 6c1d50c1,9693c485..d403282d
--- a/internal/service/user_admin/user_backyard.go
+++ b/internal/service/user_admin/user_backyard.go
@@@ -22,18 -22,18 +22,21 @@@ package user_admi
import (
"context"
"fmt"
- "github.com/apache/incubator-answer/internal/base/constant"
- "github.com/apache/incubator-answer/internal/base/handler"
- "github.com/apache/incubator-answer/internal/base/translator"
- "github.com/apache/incubator-answer/internal/base/validator"
- answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
+ "github.com/apache/answer/internal/base/constant"
+ "github.com/apache/answer/internal/base/handler"
+ "github.com/apache/answer/internal/base/translator"
+ "github.com/apache/answer/internal/base/validator"
+ answercommon "github.com/apache/answer/internal/service/answer_common"
+ "github.com/apache/incubator-answer/internal/service/badge"
- "github.com/apache/incubator-answer/internal/service/comment_common"
- "github.com/apache/incubator-answer/internal/service/export"
+ "github.com/apache/answer/internal/service/badge"
+ "github.com/apache/answer/internal/service/comment_common"
+ "github.com/apache/answer/internal/service/export"
+ notificationcommon "github.com/apache/incubator-answer/internal/service/notification_common"
+ "github.com/apache/incubator-answer/internal/service/plugin_common"
- questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
- "github.com/apache/incubator-answer/pkg/token"
+ notificationcommon "github.com/apache/answer/internal/service/notification_common"
+ "github.com/apache/answer/internal/service/plugin_common"
+ questioncommon "github.com/apache/answer/internal/service/question_common"
+ "github.com/apache/answer/pkg/token"
"net/mail"
"strings"
"time"