Commit Graph

1638 Commits

Author SHA1 Message Date
aichy126 054f7b5c9a fix scriptPath 2022-12-07 15:52:53 +08:00
aichy126 f996bdd365 Merge branch 'feat/0.6.0/seo' of git.backyard.segmentfault.com:opensource/answer into feat/0.6.0/seo 2022-12-07 15:50:52 +08:00
aichy126 962b4b098c fix search question tags 2022-12-07 15:50:46 +08:00
kumfo 5bf63452f7 fix(template/render): fix template footer / time 2022-12-07 15:45:14 +08:00
kumfo 46bff9e4f9 fix(template/render): fix template footer / time 2022-12-07 15:44:41 +08:00
aichy126 0e4514373e Merge branch 'feat/0.6.0/seo' of git.backyard.segmentfault.com:opensource/answer into feat/0.6.0/seo 2022-12-07 12:30:47 +08:00
aichy126 676a19500c userinfo show userid 2022-12-07 12:30:42 +08:00
LinkinStar 00dd6e9f0c feat(i18n): Try to return to the original text when translation is not possible 2022-12-07 11:45:41 +08:00
kumfo a3aec66dd1 Merge remote-tracking branch 'origin/feat/0.6.0/seo' into feat/0.6.0/seo 2022-12-07 11:14:10 +08:00
kumfo 9dc7d9cf44 feat(template/render): common render with 404 page 2022-12-07 11:14:05 +08:00
aichy126 78c0606e52 fix users 2022-12-07 11:11:14 +08:00
aichy126 4bb014867e Merge branch 'feat/0.6.0/seo' of git.backyard.segmentfault.com:opensource/answer into feat/0.6.0/seo 2022-12-07 10:05:15 +08:00
aichy126 9489a4291b open js 2022-12-07 10:05:11 +08:00
kumfo 44237c6f78 feat(zh_CN.yaml): sync with zh_US.yaml 2022-12-06 18:37:08 +08:00
haitao(lj) 6904c9775c Merge branch 'feat/ui-0.6.0' into feat/0.6.0/seo 2022-12-06 18:19:47 +08:00
haitao(lj) 7d6acca9c9 fix(i18n): Rewrite description as desc to be compatible with go-i18n 2022-12-06 18:13:04 +08:00
haitao(lj) c2e72d106e refactor(i18n): Rewrite description as desc to be compatible with go-i18n 2022-12-06 18:12:10 +08:00
robin ee1804f7ba core: update .gitlab-ci.yml 2022-12-06 17:44:55 +08:00
haitao(lj) fcb6197748 Merge branch 'dev' into feat/ui-0.6.0 2022-12-06 17:30:01 +08:00
aichy126 149751153c fix FuncMap 2022-12-06 17:16:42 +08:00
LinkinStar d138c372a5 fix(rename): rename function and request 2022-12-06 17:01:42 +08:00
LinkinStar f3e42f72ac Merge remote-tracking branch 'origin/feat/0.6.0/seo' into test
# Conflicts:
#	docs/docs.go
#	docs/swagger.json
#	docs/swagger.yaml
#	internal/controller/controller.go
2022-12-06 16:56:30 +08:00
LinkinStar bb8686d7cd Merge remote-tracking branch 'origin/feat/0.6.0/tag' into test 2022-12-06 16:55:20 +08:00
LinkinStar d95bd6aa79 Merge branch 'feat/0.6.0/user-role' into test
# Conflicts:
#	i18n/zh_CN.yaml
#	internal/controller/answer_controller.go
#	internal/migrations/v3.go
#	internal/schema/activity.go
2022-12-06 16:50:55 +08:00
LinkinStar 995510595b feat: support for manifest.json dynamic rendering 2022-12-06 16:41:29 +08:00
linkinstar eb0691afb3 Merge branch 'hot-fix/0.5.0' into 'main'
fix(settings/account): remove debug code

See merge request opensource/answer!319
2022-12-06 07:53:07 +00:00
haitao(lj) c9f5da63ae fix(settings/account): remove debug code 2022-12-06 15:47:31 +08:00
linkinstar 86456e2df3 Merge branch 'hot-fix/0.5.0' into 'main'
fix(settings/account): invalid group specifier name in safari

See merge request opensource/answer!318
2022-12-06 07:22:30 +00:00
haitao(lj) c05e72e995 Merge branch 'hot-fix/0.5.0' of git.backyard.segmentfault.com:opensource/answer into hot-fix/0.5.0 2022-12-06 15:17:05 +08:00
haitao(lj) adbf71434c fix(settings/account): invalid group specifier name in safari 2022-12-06 15:16:57 +08:00
linkinstar a94195fec1 Merge branch 'hot-fix/0.5.0' into 'main'
fix(rank): Incorrect permission verification

See merge request opensource/answer!317
2022-12-06 07:08:49 +00:00
LinkinStar d0393e8df1 docs(i18n): Additional Chinese translation 2022-12-06 14:53:56 +08:00
LinkinStar a6630670be fix(rank): Incorrect permission verification
user can update answer that put by himself.
admin can vote up anyway.
2022-12-06 14:45:37 +08:00
aichy126 8c4dc92f58 Merge branch 'hot-fix/0.5.0' of git.backyard.segmentfault.com:opensource/answer into hot-fix/0.5.0 2022-12-06 14:36:41 +08:00
aichy126 4c838fccfe fix revision userid to int64 2022-12-06 14:36:37 +08:00
haitao(lj) f5f3945a45 Merge branch 'hot-fix/0.5.0' of git.backyard.segmentfault.com:opensource/answer into hot-fix/0.5.0 2022-12-06 14:34:31 +08:00
haitao(lj) 90ef591cb5 fix(admin/user): comment out user role for now 2022-12-06 14:34:22 +08:00
aichy126 de429a4521 add revision userid 2022-12-06 14:32:44 +08:00
kumfo 787948f944 merge(template/i18n): merge 2022-12-06 12:25:16 +08:00
kumfo 66e420a72d Merge remote-tracking branch 'origin/feat/0.6.0/seo' into feat/0.6.0/seo
# Conflicts:
#	internal/controller/template_controller.go
2022-12-06 12:24:49 +08:00
kumfo be753459f6 feat(template/i18n): homepage convert 2022-12-06 12:23:25 +08:00
aichy126 8a7ef0ba09 language 2022-12-06 12:21:58 +08:00
aichy126 3cdd75983f i18n 2022-12-06 12:20:07 +08:00
aichy126 dcd8108fa5 Merge branch 'feat/0.6.0/seo' of git.backyard.segmentfault.com:opensource/answer into feat/0.6.0/seo 2022-12-06 12:19:57 +08:00
linkinstar 04a49d2316 Merge branch 'github/pr' into 'main'
Github/pr

See merge request opensource/answer!316
2022-12-06 04:19:11 +00:00
kumfo 6afd3d44b7 fix(template/i18n): i18n test chinese cancelled 2022-12-06 12:18:42 +08:00
aichy126 e59e95fe11 add page meta 2022-12-06 12:17:45 +08:00
kumfo d8b50b482f style(template/i18n): add todo 2022-12-06 12:17:37 +08:00
kumfo 67d93e196f feat(template/i18n): backend template render synchronous with frontend 2022-12-06 12:16:43 +08:00
LinkinStar 88fe32da17 Merge branch 'github-main' into github/pr 2022-12-06 12:13:06 +08:00