You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by sh...@apache.org on 2024/04/09 08:57:48 UTC

(incubator-answer) branch test updated (4261c461 -> 38edc4eb)

This is an automated email from the ASF dual-hosted git repository.

shuai pushed a change to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git


    from 4261c461 Feat/1.3.1/UI (#901)
     add dc757d56 fix: Account setting label issue
     add 3bec091d fix bug where no error message is showing when comment length exceeds max length when updating comment
     add 9853a60c refactor(ui): Refactor flex layout
     add d91cb2e6 fix:fix answer draft dispaly error
     add 1ce78633 feat(ui): Support route types in plugin system
     add aade1d9b feat: use captcha plugin replace captcha modal component
     add 877cfe81 feat: use captcha plugin replace captcha modal component
     add cc8dbb9b feat: resolve confict
     add a7bd5e34 fix: captcha plugin should be enabled
     new 38edc4eb fix: resolve conflict

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ui/src/utils/pluginKit/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


(incubator-answer) 01/01: fix: resolve conflict

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git

commit 38edc4eb542ada8a077aa0a91bfb30f14d48f66b
Merge: 4261c461 a7bd5e34
Author: shuai <li...@sifou.com>
AuthorDate: Tue Apr 9 16:57:38 2024 +0800

    fix: resolve conflict

 ui/src/utils/pluginKit/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)