Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
felipeelia committed May 27, 2024
2 parents 8c932a9 + 9753112 commit 67331ba
Show file tree
Hide file tree
Showing 43 changed files with 109 additions and 1,705 deletions.
Binary file modified .wordpress-org/screenshot-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ All notable changes to this project will be documented in this file, per [the Ke
### Security
-->

## [5.1.1] - 2024-05-27

### Changed
* Update Support Article URLs. Props [@felipeelia](https://github.com/felipeelia) via [#3919](https://github.com/10up/ElasticPress/pull/3919).

### Fixed
* Status report page when indexable post types is an empty array. Props [@furai](https://github.com/furai) via [#3910](https://github.com/10up/ElasticPress/pull/3910).

## [5.1.0] - 2024-04-29

### Added
Expand Down Expand Up @@ -2107,6 +2115,7 @@ This is a bug fix release with some filter additions.
- Initial plugin release

[Unreleased]: https://github.com/10up/ElasticPress/compare/trunk...develop
[5.1.1]: https://github.com/10up/ElasticPress/compare/5.1.0...5.1.1
[5.1.0]: https://github.com/10up/ElasticPress/compare/5.0.2...5.1.0
[5.0.2]: https://github.com/10up/ElasticPress/compare/5.0.1...5.0.2
[5.0.1]: https://github.com/10up/ElasticPress/compare/5.0.0...5.0.1
Expand Down
1 change: 1 addition & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ Thank you to all the people who have already contributed to this repository via
[Michael Gurtzweiler (@mgurtzweiler)](https://github.com/mgurtzweiler),
[Maarten Bruna (@ictbeheer)](https://github.com/ictbeheer),
[Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh),
[Lucas Grzegorczyk (@furai)](https://github.com/furai),
and
[@qazaqstan2025](https://github.com/qazaqstan2025).

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Tests Status](https://github.com/10up/ElasticPress/actions/workflows/test.yml/badge.svg?branch=develop)](https://github.com/10up/ElasticPress) [![Release Version](https://img.shields.io/github/release/10up/ElasticPress.svg)](https://github.com/10up/ElasticPress/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/elasticpress?label=WordPress) [![MIT License](https://img.shields.io/github/license/10up/ElasticPress.svg)](https://github.com/10up/ElasticPress/blob/develop/LICENSE.md)

* Check out the [ElasticPress Docs](https://elasticpress.zendesk.com/hc/en-us/sections/16550523637901-Developer-Documentation)
* Check out the [ElasticPress Docs](https://www.elasticpress.io/documentation/)

**Please note:** as of ElasticPress 4.0.0 `trunk` is the stable branch, built assets were removed from the `develop` branch, a ZIP with the plugin and its built assets are available on the [GitHub Releases page](https://github.com/10up/ElasticPress/releases), and will include a build script should you want to build assets from a branch. As such, please ensure you have updated any references you have from `master` to `trunk` or to GitHub releases depending on whether you require built assets or not.

Expand All @@ -14,8 +14,7 @@ ElasticPress, a fast and flexible search and query engine for WordPress, enables

## Documentation

* [Docs website ☞](https://elasticpress.zendesk.com/hc/en-us/sections/16550523637901-Developer-Documentation)
* [Support site with FAQs and tutorials ☞](https://elasticpress.zendesk.com/hc/en-us)
* [Support site with FAQs, tutorials, and docs ☞](https://www.elasticpress.io/documentation/)
* [Security Policy ☞](https://github.com/10up/ElasticPress/blob/develop/SECURITY.md)

## Requirements and Compatibility
Expand Down
2 changes: 1 addition & 1 deletion assets/js/features/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const App = () => (
// eslint-disable-next-line jsx-a11y/anchor-has-content, jsx-a11y/control-has-associated-label
<a
target="_blank"
href="https://elasticpress.zendesk.com/hc/en-us/articles/16671825423501-Features"
href="https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/"
rel="noreferrer"
/>
),
Expand Down
2 changes: 1 addition & 1 deletion assets/js/sync-ui/components/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default () => {
</Button>
)}
<Button
href="https://elasticpress.zendesk.com/hc/en-us/articles/5205632443533"
href="https://www.elasticpress.io/documentation/article/what-is-the-elasticpress-sync/"
target="_blank"
variant="link"
>
Expand Down
4 changes: 2 additions & 2 deletions assets/js/sync/src/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const useIndex = (apiUrl, nonce) => {
*/
throw new Error(
__(
'Something went wrong. Find troubleshooting steps at https://elasticpress.zendesk.com/hc/en-us/articles/20857557098125/.',
'Something went wrong. Find troubleshooting steps at https://www.elasticpress.io/documentation/article/troubleshooting-guide-elasticpress-something-went-wrong-error/.',
'elasticpress',
),
);
Expand All @@ -91,7 +91,7 @@ export const useIndex = (apiUrl, nonce) => {
*/
throw new Error(
__(
'Unable to parse response. Find troubleshooting steps at https://elasticpress.zendesk.com/hc/en-us/articles/20857557098125/.',
'Unable to parse response. Find troubleshooting steps at https://www.elasticpress.io/documentation/article/troubleshooting-guide-elasticpress-something-went-wrong-error/.',
'elasticpress',
),
);
Expand Down
2 changes: 1 addition & 1 deletion assets/js/synonyms/components/groups/replacements.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default () => {
// eslint-disable-next-line jsx-a11y/anchor-has-content, jsx-a11y/control-has-associated-label
<a
target="_blank"
href="https://elasticpress.zendesk.com/hc/en-us/articles/25809934420109-How-to-disable-fuzziness"
href="https://www.elasticpress.io/documentation/article/how-to-disable-fuzziness/"
rel="noreferrer"
/>
),
Expand Down
2 changes: 1 addition & 1 deletion docs/compatibility.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16677288265741-Compatibility](https://elasticpress.zendesk.com/hc/en-us/articles/16677288265741-Compatibility).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/compatibility/](https://www.elasticpress.io/documentation/article/compatibility/).
2 changes: 1 addition & 1 deletion docs/debugging.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16670678802189-Debugging](https://elasticpress.zendesk.com/hc/en-us/articles/16670678802189-Debugging).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/using-the-elasticpress-debugging-add-on-plugin/](https://www.elasticpress.io/documentation/article/using-the-elasticpress-debugging-add-on-plugin/).
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16670964167309-Development](https://elasticpress.zendesk.com/hc/en-us/articles/16670964167309-Development).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/development/](https://www.elasticpress.io/documentation/article/development/).
2 changes: 1 addition & 1 deletion docs/feature-api.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16671209163277-Feature-API](https://elasticpress.zendesk.com/hc/en-us/articles/16671209163277-Feature-API).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/feature-api/](https://www.elasticpress.io/documentation/article/feature-api/).
2 changes: 1 addition & 1 deletion docs/features.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16671825423501-Features](https://elasticpress.zendesk.com/hc/en-us/articles/16671825423501-Features).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/](https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/).
2 changes: 1 addition & 1 deletion docs/indexables.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16671887174541-Indexables](https://elasticpress.zendesk.com/hc/en-us/articles/16671887174541-Indexables).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/indexables/](https://www.elasticpress.io/documentation/article/indexables/).
2 changes: 1 addition & 1 deletion docs/indexing-process.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16672117103501-Sync-Process](https://elasticpress.zendesk.com/hc/en-us/articles/16672117103501-Sync-Process).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/sync-process/](https://www.elasticpress.io/documentation/article/sync-process/).
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16672190381965-Install](https://elasticpress.zendesk.com/hc/en-us/articles/16672190381965-Install).
This content was moved and is currently available at [https://www.elasticpress.io/getting-started/](https://www.elasticpress.io/getting-started/).
2 changes: 1 addition & 1 deletion docs/react.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16672275120013-React-Components](https://elasticpress.zendesk.com/hc/en-us/articles/16672275120013-React-Components).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/react-components/](https://www.elasticpress.io/documentation/article/react-components/).
2 changes: 1 addition & 1 deletion docs/theme-integration.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This content was moved and is currently available at [https://elasticpress.zendesk.com/hc/en-us/articles/16672620635661-Theme-Integration](https://elasticpress.zendesk.com/hc/en-us/articles/16672620635661-Theme-Integration).
This content was moved and is currently available at [https://www.elasticpress.io/documentation/article/theme-integration/](https://www.elasticpress.io/documentation/article/theme-integration/).
4 changes: 2 additions & 2 deletions elasticpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: ElasticPress
* Plugin URI: https://github.com/10up/ElasticPress
* Description: A fast and flexible search and query engine for WordPress.
* Version: 5.1.0
* Version: 5.1.1
* Requires at least: 6.0
* Requires PHP: 7.4
* Author: 10up
Expand Down Expand Up @@ -32,7 +32,7 @@
define( 'EP_URL', plugin_dir_url( __FILE__ ) );
define( 'EP_PATH', plugin_dir_path( __FILE__ ) );
define( 'EP_FILE', plugin_basename( __FILE__ ) );
define( 'EP_VERSION', '5.1.0' );
define( 'EP_VERSION', '5.1.1' );

define( 'EP_PHP_VERSION_MIN', '7.4' );

Expand Down
8 changes: 4 additions & 4 deletions includes/classes/AdminNotices.php
Original file line number Diff line number Diff line change
Expand Up @@ -795,8 +795,8 @@ protected function process_too_many_fields_notice() {
/* translators: Elasticsearch or ElasticPress.io; 2. Link to article; 3. Link to article */
__( 'Your website content has more public custom fields than %1$s is able to store. Check our articles about <a href="%2$s">Elasticsearch field limitations</a> and <a href="%3$s">how to index just the custom fields you need</a> before trying to sync.', 'elasticpress' ),
Utils\is_epio() ? __( 'ElasticPress.io', 'elasticpress' ) : __( 'Elasticsearch', 'elasticpress' ),
'https://elasticpress.zendesk.com/hc/en-us/articles/360051401212-I-get-the-error-Limit-of-total-fields-in-index-has-been-exceeded-',
'https://elasticpress.zendesk.com/hc/en-us/articles/360052019111'
'https://www.elasticpress.io/documentation/article/i-get-the-error-limit-of-total-fields-in-index-has-been-exceeded/',
'https://www.elasticpress.io/documentation/article/how-to-exclude-metadata-from-indexing/'
);

return [
Expand All @@ -811,8 +811,8 @@ protected function process_too_many_fields_notice() {
/* translators: Elasticsearch or ElasticPress.io; 2. Link to article; 3. Link to article */
__( 'Your website content seems to have more public custom fields than %1$s is able to store. Check our articles about <a href="%2$s">Elasticsearch field limitations</a> and <a href="%3$s">how to index just the custom fields you need</a> if you receive any errors while syncing.', 'elasticpress' ),
Utils\is_epio() ? __( 'ElasticPress.io', 'elasticpress' ) : __( 'Elasticsearch', 'elasticpress' ),
'https://elasticpress.zendesk.com/hc/en-us/articles/360051401212-I-get-the-error-Limit-of-total-fields-in-index-has-been-exceeded-',
'https://elasticpress.zendesk.com/hc/en-us/articles/360052019111'
'https://www.elasticpress.io/documentation/article/i-get-the-error-limit-of-total-fields-in-index-has-been-exceeded/',
'https://www.elasticpress.io/documentation/article/how-to-exclude-metadata-from-indexing/'
);

return [
Expand Down
6 changes: 3 additions & 3 deletions includes/classes/ElasticsearchErrorInterpreter.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ public function maybe_suggest_solution_for_es( $error ) {
/* translators: Elasticsearch or ElasticPress.io; 2. Link to article; 3. Link to article */
__( 'Your website content has more public custom fields than %1$s is able to store. Check our articles about <a href="%2$s">Elasticsearch field limitations</a> and <a href="%3$s">how to index just the custom fields you need</a> and sync again.', 'elasticpress' ),
Utils\is_epio() ? __( 'ElasticPress.io', 'elasticpress' ) : __( 'Elasticsearch', 'elasticpress' ),
'https://elasticpress.zendesk.com/hc/en-us/articles/360051401212-I-get-the-error-Limit-of-total-fields-in-index-has-been-exceeded-',
'https://elasticpress.zendesk.com/hc/en-us/articles/360052019111'
'https://www.elasticpress.io/documentation/article/i-get-the-error-limit-of-total-fields-in-index-has-been-exceeded/',
'https://www.elasticpress.io/documentation/article/how-to-exclude-metadata-from-indexing/'
),
];
}
Expand All @@ -111,7 +111,7 @@ public function maybe_suggest_solution_for_es( $error ) {
'solution' => sprintf(
/* translators: ElasticPress.io Article URL */
__( 'Please refer to <a href="%s">this article</a> outlining how to address this issue.', 'elasticpress' ),
'https://elasticpress.zendesk.com/hc/en-us/articles/26165267320461'
'https://www.elasticpress.io/documentation/article/how-to-fix-the-you-have-reached-the-limit-of-indices-of-your-plan-and-it-was-not-possible-to-create-a-new-index-error/'
),
];
}
Expand Down
6 changes: 3 additions & 3 deletions includes/classes/Feature/Autosuggest/Autosuggest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function __construct() {

$this->summary = '<p>' . __( 'Input fields of type "search" or with the CSS class "search-field" or "ep-autosuggest" will be enhanced with autosuggest functionality. As text is entered into the search field, suggested content will appear below it, based on top search results for the text. Suggestions link directly to the content.', 'elasticpress' ) . '</p>';

$this->docs_url = __( 'https://elasticpress.zendesk.com/hc/en-us/articles/360050447492-Configuring-ElasticPress-via-the-Plugin-Dashboard#autosuggest', 'elasticpress' );
$this->docs_url = __( 'https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/#autosuggest', 'elasticpress' );

$this->requires_install_reindex = true;

Expand Down Expand Up @@ -784,7 +784,7 @@ public function epio_allowed_parameters() {
<div class="input-wrap">
<?php
$epio_link = 'https://elasticpress.io';
$epio_autosuggest_kb_link = 'https://elasticpress.zendesk.com/hc/en-us/articles/360055402791';
$epio_autosuggest_kb_link = 'https://www.elasticpress.io/documentation/article/elasticpress-io-autosuggest/';
$status_report_link = defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ? network_admin_url( 'admin.php?page=elasticpress-status-report' ) : admin_url( 'admin.php?page=elasticpress-status-report' );

printf(
Expand Down Expand Up @@ -857,7 +857,7 @@ protected function maybe_add_epio_settings_schema() {
}

$epio_link = 'https://elasticpress.io';
$epio_autosuggest_kb_link = 'https://elasticpress.zendesk.com/hc/en-us/articles/360055402791';
$epio_autosuggest_kb_link = 'https://www.elasticpress.io/documentation/article/elasticpress-io-autosuggest/';
$status_report_link = defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ? network_admin_url( 'admin.php?page=elasticpress-status-report' ) : admin_url( 'admin.php?page=elasticpress-status-report' );

$this->settings_schema[] = [
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/Feature/Comments/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct() {

$this->summary = '<p>' . __( 'This feature will empower your website to overcome traditional WordPress comment search and query limitations that can present themselves at scale. This feature is only needed if you are using <code>WP_Comment_Query</code> directly.', 'elasticpress' ) . '</p>';

$this->docs_url = __( 'https://elasticpress.zendesk.com/hc/en-us/articles/360050447492-Configuring-ElasticPress-via-the-Plugin-Dashboard#comments', 'elasticpress' );
$this->docs_url = __( 'https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/#comments', 'elasticpress' );

$this->requires_install_reindex = true;

Expand Down
6 changes: 3 additions & 3 deletions includes/classes/Feature/DidYouMean/DidYouMean.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public function __construct() {

$this->title = esc_html__( 'Did You Mean', 'elasticpress' );

$this->summary = '<p>' . __( '"Did You Mean" search feature provides alternative suggestions for misspelled or ambiguous search queries, enhancing search accuracy and user experience. To display suggestions in your theme, please follow <a href="https://elasticpress.zendesk.com/hc/en-us/articles/16673223107085-Did-You-Mean">this tutorial</a>.', 'elasticpress' ) . '</p>';
$this->summary = '<p>' . __( '"Did You Mean" search feature provides alternative suggestions for misspelled or ambiguous search queries, enhancing search accuracy and user experience. To display suggestions in your theme, please follow <a href="https://www.elasticpress.io/documentation/article/did-you-mean/">this tutorial</a>.', 'elasticpress' ) . '</p>';

$this->docs_url = __( 'https://elasticpress.zendesk.com/hc/en-us/articles/16673223107085-Did-You-Mean', 'elasticpress' );
$this->docs_url = __( 'https://www.elasticpress.io/documentation/article/did-you-mean/', 'elasticpress' );

$this->requires_install_reindex = true;

Expand Down Expand Up @@ -66,7 +66,7 @@ public function output_feature_box_long() {
sprintf(
/* translators: Tutorial URL */
__( '"Did You Mean" search feature provides alternative suggestions for misspelled or ambiguous search queries, enhancing search accuracy and user experience. To display suggestions in your theme, please follow <a href="%s">this tutorial</a>.', 'elasticpress' ),
'https://elasticpress.zendesk.com/hc/en-us/articles/16673223107085-Did-You-Mean'
'https://www.elasticpress.io/documentation/article/did-you-mean/'
)
);
?>
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/Feature/Documents/Documents.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct() {

$this->summary = '<p>' . __( 'Website search results will include popular document file types, using file names as well as their content. Supported file types include: ppt, pptx, doc, docx, xls, xlsx, pdf.', 'elasticpress' ) . '</p>';

$this->docs_url = __( 'https://elasticpress.zendesk.com/hc/en-us/articles/360050447492-Configuring-ElasticPress-via-the-Plugin-Dashboard#documents', 'elasticpress' );
$this->docs_url = __( 'https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/#documents', 'elasticpress' );

$this->requires_install_reindex = false;

Expand Down
2 changes: 1 addition & 1 deletion includes/classes/Feature/Facets/Facets.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct() {
)
. '</p>';

$this->docs_url = __( 'https://elasticpress.zendesk.com/hc/en-us/articles/360050447492-Configuring-ElasticPress-via-the-Plugin-Dashboard#facets', 'elasticpress' );
$this->docs_url = __( 'https://www.elasticpress.io/documentation/article/configuring-elasticpress-via-the-plugin-dashboard/#filters', 'elasticpress' );

$this->requires_install_reindex = false;

Expand Down
Loading

0 comments on commit 67331ba

Please sign in to comment.