Merge branch 'master' into feature/material-v9

astagroup · Dec 6, 2022 · e0dce6c · e0dce6c
2 parents b82f8a5 + ae7ed95
commit e0dce6c
Show file tree

Hide file tree

Showing 36 changed files with 675 additions and 371 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,19 @@
+mkdocs-material-8.5.11 (2022-11-30)
+
+  * Let it snow, see https://twitter.com/squidfunk/status/1597939243090788352
+
+mkdocs-material-8.5.10+insiders-4.26.6 (2022-11-28)
+
+  * Fixed #4683: Tags plugin crashes when a tag is empty
+
+mkdocs-material-8.5.10+insiders-4.26.5 (2022-11-27)
+
+  * Fixed #4632: Post excerpt title link doesn't point to top of the page
+
+mkdocs-material-8.5.10+insiders-4.26.4 (2022-11-27)
+
+  * Fixed redundant file extension when using privacy plugin
+
 mkdocs-material-8.5.10+insiders-4.26.3 (2022-11-15)
 
   * Fixed #4637: Attachments w/o titles in related links error in blog plugin

diff --git a/docs/.meta.yml b/docs/.meta.yml
@@ -0,0 +1 @@
+ᴴₒᴴₒᴴₒ: true
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
@@ -2,6 +2,10 @@
 
 ## Material for MkDocs
 
+### 8.5.11 <small>_ November 30, 2022</small> { id="8.5.11" }
+
+- Let it snow, see https://twitter.com/squidfunk/status/1597939243090788352
+
 ### 8.5.10 <small>_ November 11, 2022</small> { id="8.5.10" }
 
 - Adjusted CSS to better allow for custom primary and accent colors

diff --git a/docs/index.md b/docs/index.md
@@ -1,6 +1,7 @@
 ---
 template: home.html
 title: Material for MkDocs
+ᴴₒᴴₒᴴₒ: false
 ---
 
 Welcome to Material for MkDocs.
diff --git a/docs/insiders/changelog.md b/docs/insiders/changelog.md
@@ -2,6 +2,18 @@
 
 ## Material for MkDocs Insiders
 
+### 4.26.6 <small>_ November 28, 2022</small> { id="4.26.6" }
+
+- Fixed #4683: Tags plugin crashes when a tag is empty
+
+### 4.26.5 <small>_ November 27, 2022</small> { id="4.26.5" }
+
+- Fixed #4632: Post excerpt title link doesn't point to top of the page
+
+### 4.26.4 <small>_ November 27, 2022</small> { id="4.26.4" }
+
+- Fixed redundant file extension when using privacy plugin
+
 ### 4.26.3 <small>_ November 15, 2022</small> { id="4.26.3" }
 
 - Fixed #4637: Attachments w/o titles in related links error in blog plugin

diff --git a/docs/publishing-your-site.md b/docs/publishing-your-site.md
@@ -136,9 +136,6 @@ contents:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     ```
 
-    1.  At some point, GitLab renamed `master` to `main`. If your default branch
-        is named `master`, you can safely remove `main`, vice versa.
-
 === "Insiders"
 
     ``` yaml

diff --git a/docs/schema.json b/docs/schema.json
@@ -103,6 +103,18 @@
       "uniqueItems": true,
       "minItems": 1
     },
+    "hooks": {
+      "title": "Hooks",
+      "markdownDescription": "https://www.mkdocs.org/user-guide/configuration/#hooks",
+      "type": "array",
+      "items": {
+        "title": "Path to Python file",
+        "markdownDescription": "https://www.mkdocs.org/user-guide/configuration/#hooks",
+        "pattern": "\\.py$"
+      },
+      "uniqueItems": true,
+      "minItems": 1
+    },
     "strict": {
       "title": "Strict mode",
       "markdownDescription": "https://www.mkdocs.org/user-guide/configuration/#strict",

diff --git a/docs/schema/assets/icons.json b/docs/schema/assets/icons.json
@@ -9819,7 +9819,6 @@
     "simple/aparat",
     "simple/apollographql",
     "simple/apostrophe",
-    "simple/appannie",
     "simple/appian",
     "simple/apple",
     "simple/applearcade",
@@ -9991,6 +9990,7 @@
     "simple/burton",
     "simple/buymeacoffee",
     "simple/buzzfeed",
+    "simple/bvg",
     "simple/byjus",
     "simple/byte",
     "simple/bytedance",
@@ -10152,6 +10152,7 @@
     "simple/css3",
     "simple/cssmodules",
     "simple/csswizardry",
+    "simple/cts",
     "simple/cucumber",
     "simple/curl",
     "simple/curseforge",
@@ -10181,7 +10182,6 @@
     "simple/dataiku",
     "simple/datastax",
     "simple/dataverse",
-    "simple/dataversioncontrol",
     "simple/datocms",
     "simple/datto",
     "simple/dazn",
@@ -11570,6 +11570,7 @@
     "simple/smugmug",
     "simple/snapchat",
     "simple/snapcraft",
+    "simple/sncf",
     "simple/snowflake",
     "simple/snowpack",
     "simple/snyk",

diff --git a/docs/schema/plugins/external/redirects.json b/docs/schema/plugins/external/redirects.json
@@ -17,7 +17,7 @@
                 {
                   "title": "Internal redirect",
                   "markdownDescription": "https://github.com/datarobot/mkdocs-redirects#using",
-                  "pattern": "\\.md$"
+                  "pattern": "\\.md(#\\S+)?$"
                 },
                 {
                   "title": "External redirect",

diff --git a/material/.icons/simple/appannie.svg b/material/.icons/simple/appannie.svg
diff --git a/material/.icons/simple/bvg.svg b/material/.icons/simple/bvg.svg
diff --git a/material/.icons/simple/cts.svg b/material/.icons/simple/cts.svg
diff --git a/material/.icons/simple/dataversioncontrol.svg b/material/.icons/simple/dataversioncontrol.svg
diff --git a/material/.icons/simple/sncf.svg b/material/.icons/simple/sncf.svg
diff --git a/...assets/javascripts/custom.a42114f4.min.js → ...assets/javascripts/custom.83b17dfb.min.js b/...assets/javascripts/custom.a42114f4.min.js → ...assets/javascripts/custom.83b17dfb.min.js
diff --git a/material/.overrides/assets/javascripts/custom.83b17dfb.min.js.map b/material/.overrides/assets/javascripts/custom.83b17dfb.min.js.map
diff --git a/material/.overrides/assets/javascripts/custom.a42114f4.min.js.map b/material/.overrides/assets/javascripts/custom.a42114f4.min.js.map
diff --git a/material/.overrides/assets/javascripts/iconsearch_index.json b/material/.overrides/assets/javascripts/iconsearch_index.json
diff --git a/material/.overrides/main.html b/material/.overrides/main.html
@@ -16,5 +16,5 @@
 {% endblock %}
 {% block scripts %}
   {{ super() }}
-  <script src="{{ 'assets/javascripts/custom.a42114f4.min.js' | url }}"></script>
+  <script src="{{ 'assets/javascripts/custom.83b17dfb.min.js' | url }}"></script>
 {% endblock %}