p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
722 Commits 88 Branches 22 Tags 15 MiB
Commit Graph

722 Commits

Author SHA1 Message Date
杨光富 a254f432ff Merge branch 'feat/cut-text' into 'dev' 
Feat/cut text

See merge request opensource/answer!194
 2022-11-07 08:13:32 +00:00
kumfo d40e686b73 Merge branch 'dev' into feat/cut-text 2022-11-07 16:06:05 +08:00
kumfo 8b312cde7e feat: unified processing excerpt 2022-11-07 16:05:01 +08:00
kumfo c7ee44d33c feat: get text excerpt 2022-11-07 14:32:17 +08:00
kumfo ad8cb70d49 feat: get text excerpt 2022-11-07 14:29:49 +08:00
kumfo 8f567e0abd feat: get text excerpt 2022-11-07 14:27:54 +08:00
杨光富 4794146928 Merge branch 'fix/search' into 'dev' 
fix: change from xorm builder union query to manual build query

See merge request opensource/answer!181
 2022-11-04 07:06:32 +00:00
kumfo 7bea814bd4 fix: change from xorm builder union query to manual build query 2022-11-04 15:00:15 +08:00
kumfo f2ac965be3 Merge branch 'main' of github.com:answerdev/answer 2022-11-04 12:27:23 +08:00
Dong Feng 08c224a9a4 Merge branch 'fix/typo' into 'main' 
fix typo

See merge request opensource/answer!173
 2022-11-03 06:48:25 +00:00
Dong Feng e8a5677b26 Merge branch 'main' into 'fix/typo' 
# Conflicts:
#   ui/src/i18n/locales/en.json
 2022-11-03 06:38:56 +00:00
fen 4d8e4b5ca4 fix typo 2022-11-03 14:36:38 +08:00
robin 86ac1f19de
Merge pull request #62 from ppchart/ci-only-use-pnpm 
Only allow use pnpm
 2022-11-02 21:00:38 +08:00
ppchart bbbc1db105 Only allow use pnpm 2022-11-02 16:20:53 +08:00
aichy 223ff7b2bd Merge branch 'ci-docker-compose' into 'main' 
ci: docker compose

See merge request opensource/answer!159
 2022-11-02 08:01:37 +00:00
明城 9593963aee ci: docker compose 2022-11-02 08:01:37 +00:00
LinkinStar 79cc30355a update: gitlab ci only deploy on test 2022-11-02 14:43:45 +08:00
linkinstar f1f20a228c Merge branch 'pr/github' into 'main' 
Pr/github

See merge request opensource/answer!158
 2022-11-02 06:17:05 +00:00
LinkinStar 7e29230d2d Merge branch 'main' into github-main 2022-11-02 14:10:12 +08:00
robin b0595b8ded
Merge pull request #60 from answerdev/revert-17-main 
Revert "Fix RouteNode type error"
 2022-11-02 13:17:02 +08:00
robin 53501a3692
Revert "Fix RouteNode type error" 2022-11-02 13:15:52 +08:00
linkinstar fa9536c5ca Merge branch 'ai_fix_user_avatar' into 'main' 
fix AvatarInfo  json.Unmarshal error

See merge request opensource/answer!157
 2022-11-02 03:52:35 +00:00
aichy126 27e3e2ec8c fix AvatarInfo json.Unmarshal error 2022-11-02 11:46:26 +08:00
robin ffb2b6ddc8
Merge pull request #17 from ppchart/main 
Fix RouteNode type error
 2022-11-02 10:55:14 +08:00
杨光富 861477234a Merge branch 'fix/search' into 'main' 
Fix/search

See merge request opensource/answer!156
 2022-11-02 02:23:35 +00:00
Li Shuailing 32ed838211 Merge branch 'fix-ui-v0.2' into 'main' 
fix: custom avatar need upload

See merge request opensource/answer!155
 2022-11-02 02:22:00 +00:00
shuai a4d55e629c fix: custom avatar need upload 2022-11-02 10:15:08 +08:00
kumfo 1711ab5753 feat: admin's answer list filter by question id 2022-11-01 18:18:29 +08:00
kumfo c6d703321f feat: admin's answer list filter by question id 2022-11-01 18:15:18 +08:00
mingcheng 73c170ca9c Merge branch 'main' of git.backyard.segmentfault.com:opensource/answer 2022-11-01 18:09:48 +08:00
linkinstar e0106e6a63 Merge branch 'doc/README' into 'main' 
doc: update README docker volume path

See merge request opensource/answer!153
 2022-11-01 09:47:24 +00:00
LinkinStar 984e05edac doc: update README docker volume path 2022-11-01 17:35:53 +08:00
杨光富 aa9ba8a3f6 Merge branch 'feat/backyard-search' into 'main' 
Feat/backyard search

See merge request opensource/answer!152
 2022-11-01 09:30:41 +00:00
杨光富 0dfcc0a3b8 Merge branch 'fix/search' into 'main' 
Fix/search

See merge request opensource/answer!151
 2022-11-01 09:28:39 +00:00
linkinstar 2f277921bb Merge branch 'ai_fix_user_avatar' into 'main' 
fix user avatar Unmarshal

See merge request opensource/answer!150
 2022-11-01 09:28:17 +00:00
kumfo c3f42f1d9e fix: search sql parse error when query words is empty 2022-11-01 17:20:34 +08:00
Li Shuailing 70c5991323 Merge branch 'fix-ui-v0.2' into 'main' 
fix: gravatar add default params

See merge request opensource/answer!148
 2022-11-01 09:11:35 +00:00
aichy126 92fbdbbc81 fix user avatar Unmarshal 2022-11-01 17:05:12 +08:00
shuai 05268e820d fix: gravatar add default params 2022-11-01 17:03:54 +08:00
kumfo b3b0d2e1db Merge branch 'main' into fix/search 2022-11-01 17:00:20 +08:00
kumfo d9bddb8210 feat: admin's id search condition 2022-11-01 16:51:01 +08:00
kumfo 5b28c70f88 Merge branch 'main' into feat/backyard-search 2022-11-01 16:48:50 +08:00
linkinstar 5ddc732dba Merge branch 'feat/repo-unit-test' into 'main' 
Feat/repo unit test

See merge request opensource/answer!147
 2022-11-01 08:35:08 +00:00
LinkinStar c10930d160 fix: revision use created_at as the condition 2022-11-01 16:27:33 +08:00
LinkinStar 425159ecc3 merge: repo unit test 2022-11-01 16:22:51 +08:00
Li Shuailing 1bd05ed515 Merge branch 'fix-ui-v0.2' into 'main' 
fix: navbar style adjustment

See merge request opensource/answer!146
 2022-11-01 08:20:36 +00:00
LinkinStar cec446047d Merge branch 'main' into feat/repo-unit-test 
# Conflicts:
#	cmd/answer/wire_gen.go
#	go.mod
#	go.sum
#	internal/controller/user_controller.go
#	internal/repo/notification/notification_repo.go
#	internal/repo/revision/revision_repo.go
#	internal/repo/tag/tag_rel_repo.go
#	internal/repo/tag/tag_repo.go
#	internal/schema/user_schema.go
 2022-11-01 16:17:03 +08:00
shuai 875a32aeda fix: navbar style adjustment 2022-11-01 16:15:30 +08:00
linkinstar 76d0c92bac Merge branch 'doc/swagger' into 'main' 
doc: update swagger

See merge request opensource/answer!144
 2022-11-01 08:02:04 +00:00
LinkinStar 53084a7277 doc: update swagger 2022-11-01 15:52:38 +08:00