Merge branch 'develop'

10up · Nov 20, 2019 · 0e25773 · 0e25773
2 parents 596020c + 5dc9c34
commit 0e25773
Show file tree

Hide file tree

Showing 21 changed files with 853 additions and 735 deletions.
diff --git a/.github/hookdoc-tmpl/README.md b/.github/hookdoc-tmpl/README.md
@@ -1,9 +1,15 @@
-# Welcome to the ElasticPress Plugin Hook Documentation
+# ElasticPress Documentation
 
-This resource is generated documentation on actions and filters found in the ElasticPress plugin. Use the sidebar to browse and navigate.
+ElasticPress, a fast and flexible search and query engine for WordPress, enables WordPress to find or “query” relevant content extremely fast through a variety of highly customizable features. WordPress out-of-the-box struggles to analyze content relevancy and can be very slow. ElasticPress supercharges your WordPress website making for happier users and administrators. The plugin even contains features for popular plugins.
+
+**ElasticPress 3.0:** ElasticPress 3.0 contains major changes from 2.x including a rewrite of the feature registration API and PHP 5.4+ features. If you have problems upgrading, please create an issue.
+
+**Please note:** master is the stable branch on GitHub.
+
+**Upgrade Notice:** Versions 1.6.1, 1.6.2, 1.7, 1.8, 2.1, 2.1.2, 2.2, 2.7, 3.0 require re-syncing.
 
 For more information about the ElasticPress plugin and ElasticPress.io service, please visit the [website](https://elasticpress.io).
 
 To report an issue with ElasticPress or contribute back to the project, please visit the [GitHub repository](https://github.com/10up/elasticpress/).
 
-<a href="http://10up.com/contact/" class="banner"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
+<a href="http://10up.com/contact/" class="banner"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
diff --git a/.github/hookdoc-tmpl/static/styles-10up.css b/.github/hookdoc-tmpl/static/styles-10up.css
@@ -18,6 +18,36 @@ h1.page-title {
 	margin-top: .5em;
 }
 
+nav {
+	display: flex;
+	flex-direction: column;
+}
+
+nav * {
+	order: 4;
+}
+
+nav h2 {
+	order: 1;
+}
+
+nav h3:nth-of-type(3) {
+	order: 2;
+	visibility: hidden;
+	position: relative;
+}
+
+nav h3:nth-of-type(3):after {
+	content: 'Docs';
+	visibility: visible;
+	position: absolute;
+	left: 0;
+}
+
+nav ul:nth-of-type(3) {
+	order: 3;
+}
+
 nav ul {
 	font-size: 1.2rem;
 }
@@ -75,6 +105,13 @@ a.banner img {
 	max-width: 888px;
 }
 
+article img {
+	width: 100%;
+	max-width: 888px;
+	height: auto;
+	margin: 15px 0;
+}
+
 footer {
 	text-align: center;
 	font-size: .8em;
@@ -94,5 +131,4 @@ footer {
 .prettyprint code {
 	padding: 2px 10px;
 	line-height: 16px;
-	height: 16px;
 }
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -24,5 +24,5 @@ jobs:
     - name: Deploy to GH Pages
       uses: maxheld83/ghpages@v0.2.1
       env:
-        BUILD_DIR: 'docs/'
+        BUILD_DIR: 'docs-built/'
         GH_PAT: ${{ secrets.GH_PAT }}
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 node_modules
 .idea
 .history
-docs
+docs-built
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
+## [3.2.5] - 2019-11-20
+
+* Fix WP <5.0 fatal error on register_block_type.
+
+## [3.2.4] - 2019-11-19
+
+* Fix Gutenberg block initialization
+* Fix Autosuggest: remove filter with proper priority in query generation. Props [Maxdw](https://github.com/Maxdw).
+* Fix Autosuggest: returning WP_Error for non object cache autosuggest queries causes issue. Fallback to transient
+
 ## [3.2.3] - 2019-11-13
 
 * Ensure query building for Autosuggest does not fallback to WPDB.