diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 262bb9af4..a82088165 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -5,7 +5,7 @@ on: push: paths: - 'docs/**.md' - branches: [develop, master] + branches: [develop, main] jobs: crowdin: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 814cabef0..67c6c0f00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Build & Test on: push: - branches: [master, main, develop] + branches: [main, develop] pull_request: - branches: [master, main, develop] + branches: [main, develop] workflow_dispatch: jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 918740872..41e079fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [4.13.1](https://github.com/docsifyjs/docsify/compare/v4.13.0...v4.13.1) (2023-06-24) + + +### Bug Fixes + +* enhancement of isExternal ([#2093](https://github.com/docsifyjs/docsify/issues/2093)) ([6a7d15b](https://github.com/docsifyjs/docsify/commit/6a7d15b1d5b93e19d3cf9a328cdbf5f1a166b5bd)) +* fix cross-origin links in history router mode ([#1967](https://github.com/docsifyjs/docsify/issues/1967)) ([2312fee](https://github.com/docsifyjs/docsify/commit/2312feef459211a8bcdcbf9164a9ffe051609b70)) +* genIndex error for search ([#1933](https://github.com/docsifyjs/docsify/issues/1933)) ([68d8735](https://github.com/docsifyjs/docsify/commit/68d873587c29d694ece466177984aa5fd739dd4b)) + + + # [4.13.0](https://github.com/docsifyjs/docsify/compare/v4.12.4...v4.13.0) (2022-10-26) diff --git a/README.md b/README.md index e618e8f79..31d759d34 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ A large collection of showcase projects are included in [awesome-docsify](https: ## Contributing -See [CONTRIBUTING.md](./CONTRIBUTING.md). +See [CONTRIBUTING.md](CONTRIBUTING.md). ## Backers @@ -75,12 +75,9 @@ Thank you for supporting this project! ❤️ [[Become a sponsor](https://openco ## Contributors This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. + ## License [MIT](LICENSE) - -## Special Thanks - -A preview of Docsify's PR and develop branch is Powered by Vercel diff --git a/build/release.sh b/build/release.sh index f2b874681..fe26eb452 100755 --- a/build/release.sh +++ b/build/release.sh @@ -17,6 +17,8 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then # test npm run test + # update snapshot + npm run test:update:snapshot # commit git add -A diff --git a/docs/README.md b/docs/README.md index e246e6c20..1486fa48b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -25,10 +25,6 @@ Check out the [Showcase](https://github.com/docsifyjs/awesome-docsify#showcase) Please consider donating if you think docsify is helpful to you or that my work is valuable. I am happy if you can help me [buy a cup of coffee](https://github.com/QingWei-Li/donate). :heart: -### Gold sponsors - -[![](_images/Route4Me.png ':size=200')](https://route4me.com/ 'Best Route Planning and Route Optimization Software') - ## Community Users and the development team are usually in the [Discord server](https://discord.gg/3NwKFyR). diff --git a/docs/_coverpage.md b/docs/_coverpage.md index ea49441e1..8bbe61854 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -2,7 +2,7 @@ ![logo](_media/icon.svg) -# docsify 4.13.0 +# docsify 4.13.1 > A magical documentation site generator diff --git a/docs/_images/Route4Me.png b/docs/_images/Route4Me.png deleted file mode 100644 index 46df6d2f8..000000000 Binary files a/docs/_images/Route4Me.png and /dev/null differ diff --git a/docs/_navbar.md b/docs/_navbar.md index 8bd861259..c1e263e1a 100644 --- a/docs/_navbar.md +++ b/docs/_navbar.md @@ -4,6 +4,3 @@ - [English](/) - [简体中文](/zh-cn/) - - [Deutsch](/de-de/) - - [Español](/es/) - - [Русский](/ru-ru/) diff --git a/docs/adding-pages.md b/docs/adding-pages.md index 9ce19f9d7..9a5b2454b 100644 --- a/docs/adding-pages.md +++ b/docs/adding-pages.md @@ -25,7 +25,7 @@ docs/zh-cn/guide.md => http://domain.com/#/zh-cn/guide ## Sidebar -In order to have a sidebar, you can create your own `_sidebar.md` (see [this documentation's sidebar](https://github.com/docsifyjs/docsify/blob/master/docs/_sidebar.md) for an example): +In order to have a sidebar, you can create your own `_sidebar.md` (see [this documentation's sidebar](https://github.com/docsifyjs/docsify/blob/main/docs/_sidebar.md) for an example): First, you need to set `loadSidebar` to **true**. Details are available in the [configuration paragraph](configuration.md#loadsidebar). diff --git a/docs/configuration.md b/docs/configuration.md index c2fa6d897..a11f89806 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -43,7 +43,7 @@ window.$docsify = { '/foo/(.*)': '/bar/$1', // supports regexp '/zh-cn/changelog': '/changelog', '/changelog': - 'https://raw.githubusercontent.com/docsifyjs/docsify/master/CHANGELOG', + 'https://raw.githubusercontent.com/docsifyjs/docsify/main/CHANGELOG', // You may need this if you use routerMode:'history'. '/.*/_sidebar.md': '/_sidebar.md', // See #301 @@ -284,7 +284,7 @@ window.$docsify = { // Or use the readme in your repo homepage: - 'https://raw.githubusercontent.com/docsifyjs/docsify/master/README.md', + 'https://raw.githubusercontent.com/docsifyjs/docsify/main/README.md', }; ``` diff --git a/docs/index.html b/docs/index.html index 734fe87e5..4da308171 100644 --- a/docs/index.html +++ b/docs/index.html @@ -81,7 +81,7 @@