Merge branch '1.39.7-new3' into RELEASE1_39

.github/ISSUE_TEMPLATE/reprt-bugs.yaml

@@ -0,0 +1,62 @@
+name: 报告漏洞 Report Bugs
+description: 汇报 MediaWiki 软件问题 Report MediaWiki software bugs.
+title: "[BUG]: "
+labels: ["bug"]
+assignees:
+  - ZoruaFox
+  - Blossomstripe
+  - windaoist
+body:
+  - type: markdown
+    attributes:
+      value: |
+        若您在使用档案馆时发现相关漏洞，请使用本模板汇报。<br>If you encountered bugs while using YouShou Archives, please report bugs here
+
+        **请注意**，若您的 Issue 与档案馆敏感信息（如令牌、密码等）有关，请使用最下方的“安全漏洞汇报”模板，请勿使用本模板。<br>NOTICE: If your issue is about security problems (tokens, passwords, etc.), please use "Report a security vulnerability" issue template, do not use this template.
+  - type: dropdown
+    id: urgency
+    attributes:
+      label: 紧急程度 Urgency
+      description: 漏洞紧急程度 Bug urgency
+      options:
+        - 低 Low
+        - 中 Medium
+        - 高 High
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: 漏洞描述 Description
+      description: 具体描述漏洞 Describe the bug
+    validations:
+      required: false
+  - type: textarea
+    id: reproducing
+    attributes:
+      label: 复现方法 Reproduction
+      description: 你是如何触发这个问题的 How this bug happened? 
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: 截图 Screenshots
+      description: （选填）漏洞截图 (Optional)Bug Screenshots
+    validations:
+      required: false
+  - type: input
+    id: usermame
+    attributes:
+      label: 用户名 Username
+      description: 你的档案馆用户名 You username on YouShou Archives.
+      placeholder: e.g. ZoruaFox
+    validations:
+      required: true
+  - type: textarea
+    id: other
+    attributes:
+      label: 备注 P.S.
+      description: 还想告诉我们什么？ What else?
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/request-features.yaml

@@ -0,0 +1,49 @@
+name: 功能建议
+description: 提出新的建议。
+title: "[FEATURE]: "
+labels: ["enhancement"]
+assignees:
+  - OasisAkari
+body:
+  - type: markdown
+    attributes:
+      value: |
+        向档案馆提出更多功能建议。 Suggest more features about YouShou Archives.
+  - type: checkboxes
+    id: preflight
+    attributes:
+      label: 开始之前……
+      options:
+        - label: 我已在[漏洞追踪器](https://github.com/TopRealm/MediaWiki/issues)中搜索过我的建议，确定没有人提出过此建议<br>I double checked [Issues](https://github.com/TopRealm/MediaWiki/issues) and no one has suggested it.
+          required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: 建议描述 Feture Description
+      description: 请描述你的建议。 Please describe your suggestions.
+      placeholder: 建议添加114514个插件
+    validations:
+      required: true
+  - type: textarea
+    id: reproducing
+    attributes:
+      label: 实现方法 How To Achieve This
+      description: 你认为可以实现的方法。Ways you think this feature can be achieved
+      placeholder: OAuth 启动！
+    validations:
+      required: false
+  - type: input
+    id: api
+    attributes:
+      label: 接口 APIS Or Docs
+      description: 你是否有便于实现这个功能的接口链接/文档？ Do you have any documents to achieve this?
+      placeholder: https://docs.github.com/cn/rest/reference/search
+    validations:
+      required: false
+  - type: textarea
+    id: other
+    attributes:
+      label: 备注 P.S.
+      description: 还想告诉我们什么？ What else?
+    validations:
+      required: falsefalsefalsefalse

.github/auto_asign_configs.yml

@@ -0,0 +1,9 @@
+addReviewers: true
+
+addAssignees: false
+
+numberOfReviewers: 0
+
+reviewers:
+  - ZoruaFox
+  - Blossomstripe

.github/workflows/auto-assign-pr.yml

@@ -0,0 +1,12 @@
+name: 'Auto Assign'
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  add-reviewers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kentaro-m/[email protected]
+        with:
+          configuration-path: '.github/auto_asign_configs.yml'

.gitignore

@@ -23,8 +23,26 @@ sftp-config.json
 ## Visual Studio Code
 *.vscode/
 
+# Ysarxiv-Settings
+ysarxiv-settings
+oauthkeys
+/.well-known
+/matomo-tracking-code.js
+# sitemaps
+/sitemap
+
+# site auth
+/baidu_verify_*
+/google*.html
+/BingSiteAuth.xml
+/sogousiteverification.txt
+
+# sitemaps
+/sitemap
+
 # MediaWiki install & usage
 /cache
+/logs
 /docs/coverage
 /docs/js
 /docs/latex
@@ -39,14 +57,17 @@ sftp-config.json
 /images/timeline
 ## Extension:Score
 /images/lilypond
+## Extension:Phonos
+/images/phonos-render
 ## Extension:TimedMediaHandler
 /images/transcoded
 /images/tmp
 /maintenance/.mweval_history
 /maintenance/.mwsql_history
 /maintenance/dev/data
-/LocalSettings.php
 /includes/PlatformSettings.php
+## Extension:Avatar
+/images/avatars
 
 # Building & testing
 npm-debug.log
@@ -62,6 +83,7 @@ phpunit.xml
 .phan/local-config.php
 
 # Composer
+/vendor
 /composer.lock
 /composer.local.json
 /composer.phar

.gitmodules

@@ -1,136 +1,9 @@
-[submodule "extensions/AbuseFilter"]
-	path = extensions/AbuseFilter
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter
-	branch = REL1_39
-[submodule "extensions/CategoryTree"]
-	path = extensions/CategoryTree
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree
-	branch = REL1_39
-[submodule "extensions/Cite"]
-	path = extensions/Cite
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite
-	branch = REL1_39
-[submodule "extensions/CiteThisPage"]
-	path = extensions/CiteThisPage
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage
-	branch = REL1_39
-[submodule "extensions/CodeEditor"]
-	path = extensions/CodeEditor
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeEditor
-	branch = REL1_39
-[submodule "extensions/ConfirmEdit"]
-	path = extensions/ConfirmEdit
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit
-	branch = REL1_39
-[submodule "extensions/Gadgets"]
-	path = extensions/Gadgets
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Gadgets
-	branch = REL1_39
-[submodule "extensions/ImageMap"]
-	path = extensions/ImageMap
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ImageMap
-	branch = REL1_39
-[submodule "extensions/InputBox"]
-	path = extensions/InputBox
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/InputBox
-	branch = REL1_39
-[submodule "extensions/Interwiki"]
-	path = extensions/Interwiki
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Interwiki
-	branch = REL1_39
-[submodule "extensions/Math"]
-	path = extensions/Math
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Math
-	branch = REL1_39
-[submodule "extensions/MultimediaViewer"]
-	path = extensions/MultimediaViewer
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
-	branch = REL1_39
-[submodule "extensions/Nuke"]
-	path = extensions/Nuke
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Nuke
-	branch = REL1_39
-[submodule "extensions/OATHAuth"]
-	path = extensions/OATHAuth
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/OATHAuth
-	branch = REL1_39
-[submodule "extensions/PageImages"]
-	path = extensions/PageImages
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageImages
-	branch = REL1_39
-[submodule "extensions/ParserFunctions"]
-	path = extensions/ParserFunctions
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ParserFunctions
-	branch = REL1_39
-[submodule "extensions/PdfHandler"]
-	path = extensions/PdfHandler
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler
-	branch = REL1_39
-[submodule "extensions/Poem"]
-	path = extensions/Poem
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Poem
-	branch = REL1_39
-[submodule "extensions/Renameuser"]
-	path = extensions/Renameuser
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Renameuser
-	branch = REL1_39
-[submodule "extensions/ReplaceText"]
-	path = extensions/ReplaceText
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ReplaceText
-	branch = REL1_39
-[submodule "extensions/Scribunto"]
-	path = extensions/Scribunto
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto
-	branch = REL1_39
-[submodule "extensions/SecureLinkFixer"]
-	path = extensions/SecureLinkFixer
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SecureLinkFixer
-	branch = REL1_39
-[submodule "extensions/SpamBlacklist"]
-	path = extensions/SpamBlacklist
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist
-	branch = REL1_39
-[submodule "extensions/SyntaxHighlight_GeSHi"]
-	path = extensions/SyntaxHighlight_GeSHi
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SyntaxHighlight_GeSHi
-	branch = REL1_39
-[submodule "extensions/TemplateData"]
-	path = extensions/TemplateData
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData
-	branch = REL1_39
-[submodule "extensions/TextExtracts"]
-	path = extensions/TextExtracts
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TextExtracts
-	branch = REL1_39
-[submodule "extensions/TitleBlacklist"]
-	path = extensions/TitleBlacklist
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist
-	branch = REL1_39
-[submodule "extensions/VisualEditor"]
-	path = extensions/VisualEditor
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
-	branch = REL1_39
-[submodule "extensions/WikiEditor"]
-	path = extensions/WikiEditor
-	url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiEditor
-	branch = REL1_39
-[submodule "skins/MinervaNeue"]
-	path = skins/MinervaNeue
-	url = https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
-	branch = REL1_39
-[submodule "skins/MonoBook"]
-	path = skins/MonoBook
-	url = https://gerrit.wikimedia.org/r/mediawiki/skins/MonoBook
-	branch = REL1_39
-[submodule "skins/Timeless"]
-	path = skins/Timeless
-	url = https://gerrit.wikimedia.org/r/mediawiki/skins/Timeless
-	branch = REL1_39
-[submodule "skins/Vector"]
-	path = skins/Vector
-	url = https://gerrit.wikimedia.org/r/mediawiki/skins/Vector
-	branch = REL1_39
-[submodule "vendor"]
-	path = vendor
-	url = https://gerrit.wikimedia.org/r/mediawiki/vendor
-	branch = REL1_39
+[submodule "skins"]
+	path = skins
+	url = https://github.com/TopRealm/YsArchives-Skins
+[submodule "errorpages"]
+	path = errorpages
+	url = https://github.com/TopRealm/YsArchives-Errorpages
+[submodule "extensions"]
+	path = extensions
+	url = https://github.com/TopRealm/YsArchives-Extensions

.mailmap

@@ -534,3 +534,5 @@ Zppix <[email protected]>
 Željko Filipin <[email protected]> <[email protected]>
 星耀晨曦 <[email protected]>
 星耀晨曦 <[email protected]> <[email protected]>
+海屿有燕 <[email protected]>
+华纹 <[email protected]>

CREDITS

@@ -970,8 +970,12 @@ The following list can be found parsed under Special:Version/Credits -->
 * Þjarkur
 * محمد شعیب
 * 星耀晨曦
+* 海屿有燕
+* 华纹
 <!-- END CONTRIBUTOR LIST -->
 
 == Translators ==
 
 * [https://translatewiki.net/wiki/Translating:MediaWiki/Credits Translators on translatewiki.net and others]
+
+<center>[[File:有兽档案馆Banner.png|有兽档案馆Banner|x400px]]</center>