@@ -292,6 +315,23 @@ class JetpackNotices extends React.Component {
) }
+ { showMasterbarNotice && (
+
+
+ { __( "Jetpack's WordPress.com Toolbar feature has been removed.", 'jetpack' ) }
+
+
+ { __(
+ 'To find out more about what this means for you, please refer to this document',
+ 'jetpack'
+ ) }
+
+
+ ) }
);
}
@@ -330,6 +370,7 @@ export default connect(
state,
'jetpack-legacy-google-analytics/jetpack-legacy-google-analytics.php'
),
+ showMasterbarNotice: window.Initial_State?.isMasterbarActive && ! isWoASite( state ),
};
},
dispatch => {
diff --git a/projects/plugins/jetpack/_inc/client/writing/index.jsx b/projects/plugins/jetpack/_inc/client/writing/index.jsx
index 0ba27d6ca320d..9906411e838d2 100644
--- a/projects/plugins/jetpack/_inc/client/writing/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/writing/index.jsx
@@ -15,7 +15,6 @@ import { isModuleFound } from 'state/search';
import { getSettings } from 'state/settings';
import Composing from './composing';
import CustomContentTypes from './custom-content-types';
-import { Masterbar } from './masterbar';
import PostByEmail from './post-by-email';
import ThemeEnhancements from './theme-enhancements';
import Widgets from './widgets';
@@ -92,9 +91,6 @@ export class Writing extends React.Component {
userCanManageModules={ this.props.userCanManageModules }
/>
) }
- { this.props.isModuleFound( 'masterbar' ) && ! this.props.masterbarIsAlwaysActive && (
-
{ __(
diff --git a/projects/plugins/jetpack/_inc/client/writing/masterbar.jsx b/projects/plugins/jetpack/_inc/client/writing/masterbar.jsx
deleted file mode 100644
index 5fd9cd9c154d1..0000000000000
--- a/projects/plugins/jetpack/_inc/client/writing/masterbar.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { getRedirectUrl } from '@automattic/jetpack-components';
-import { __, _x } from '@wordpress/i18n';
-import ConnectUserBar from 'components/connect-user-bar';
-import { withModuleSettingsFormHelpers } from 'components/module-settings/with-module-settings-form-helpers';
-import { ModuleToggle } from 'components/module-toggle';
-import SettingsCard from 'components/settings-card';
-import SettingsGroup from 'components/settings-group';
-import React, { Component } from 'react';
-
-export const Masterbar = withModuleSettingsFormHelpers(
- class extends Component {
- render() {
- const isActive = this.props.getOptionValue( 'masterbar' ),
- unavailableInOfflineMode = this.props.isUnavailableInOfflineMode( 'masterbar' );
-
- return (
-
-
-
- { __(
- 'The WordPress.com toolbar replaces the default WordPress admin toolbar. It offers one-click access to notifications, your WordPress.com profile and your other Jetpack and WordPress.com websites. You can also catch up on the sites you follow in the Reader.',
- 'jetpack'
- ) }
-
-
-
- { __( 'Enable the WordPress.com toolbar', 'jetpack' ) }
-
-
-
-
- { ! this.props.isUnavailableInOfflineMode( 'masterbar' ) && ! this.props.isLinked && (
-
- ) }
-
- );
- }
- }
-);
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
index f7a4dba2ca5fb..31b87c1dfddfe 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
@@ -249,6 +249,7 @@ public static function get_initial_state() {
'newsletterDateExample' => gmdate( get_option( 'date_format' ), time() ),
'subscriptionSiteEditSupported' => $current_theme->is_block_theme(),
'isGoogleAnalyticsActive' => ( new Modules() )->is_active( 'google-analytics', false ),
+ 'isMasterbarActive' => ( new Modules() )->is_active( 'masterbar', false ),
);
}
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php
index 75885fee98be1..d157eb2f3e222 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php
@@ -6,8 +6,6 @@
* @since 9.1.0
*/
-use Automattic\Jetpack\Status\Host;
-
/**
* Class WPCOM_REST_API_V2_Endpoint_Admin_Menu
*/
@@ -85,9 +83,6 @@ public function get_item_permissions_check( $request ) { // phpcs:ignore Generic
* @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
*/
public function get_item( $request ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
- if ( ! ( new Host() )->is_wpcom_platform() && get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
- require_once JETPACK__PLUGIN_DIR . 'jetpack_vendor/automattic/jetpack-masterbar/src/admin-menu/load.php';
- }
// All globals need to be declared for menu items to properly register.
global $admin_page_hooks, $menu, $menu_order, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
@@ -119,7 +114,9 @@ private function hide_customizer_menu_on_block_theme() {
remove_action( 'customize_register', array( 'Jetpack_Fonts_Typekit', 'maybe_override_for_advanced_mode' ), 20 );
- remove_action( 'customize_register', 'Automattic\Jetpack\Masterbar\register_css_nudge_control' );
+ if ( class_exists( 'Automattic\Jetpack\Masterbar' ) ) {
+ remove_action( 'customize_register', 'Automattic\Jetpack\Masterbar\register_css_nudge_control' );
+ }
remove_action( 'customize_register', array( 'Jetpack_Custom_CSS_Enhancements', 'customize_register' ) );
}
diff --git a/projects/plugins/jetpack/changelog/add-filter-for-filtered-order-data b/projects/plugins/jetpack/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/changelog/atomic-default-profile b/projects/plugins/jetpack/changelog/atomic-default-profile
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/atomic-default-profile
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/changelog/fix-social-icons-wrong-path b/projects/plugins/jetpack/changelog/fix-social-icons-wrong-path
new file mode 100644
index 0000000000000..3c31d74139486
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-social-icons-wrong-path
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Social Icons Widget: ensure the social network icons are displayed properly.
diff --git a/projects/plugins/jetpack/changelog/fix-social-menus-svg b/projects/plugins/jetpack/changelog/fix-social-menus-svg
new file mode 100644
index 0000000000000..d3e6f589fb003
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-social-menus-svg
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Social Menus: ensure the SVG can be displayed properly.
diff --git a/projects/plugins/jetpack/changelog/remove-masterbar-feature-jetpack b/projects/plugins/jetpack/changelog/remove-masterbar-feature-jetpack
new file mode 100644
index 0000000000000..62e4cd1a3448a
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/remove-masterbar-feature-jetpack
@@ -0,0 +1,4 @@
+Significance: minor
+Type: compat
+
+WordPress.com Toolbar: Removed feature from Jetpack self-hosted sites.
diff --git a/projects/plugins/jetpack/changelog/site-is-a4a-dev-site b/projects/plugins/jetpack/changelog/site-is-a4a-dev-site
new file mode 100644
index 0000000000000..c4263011c9598
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/site-is-a4a-dev-site
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Add a4a_is_dev_site attribute to Sites API response.
diff --git a/projects/plugins/jetpack/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/jetpack/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..f4e2f149d1e82
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Update lock file
diff --git a/projects/plugins/jetpack/changelog/update-sharing-block-check-content b/projects/plugins/jetpack/changelog/update-sharing-block-check-content
new file mode 100644
index 0000000000000..c31d0572f2db6
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-sharing-block-check-content
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+Sharing Block: improve performance when hooking the block into single post templates.
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 75d74bdadebf4..2ce6fee251893 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -1665,7 +1665,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "9f21b1d7607b21df7becfcdb49002d310d891440"
+ "reference": "39a207e6ee97aa176b4198439f5b7e8bc911ef87"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1693,7 +1693,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.6.x-dev"
+ "dev-trunk": "0.7.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
@@ -1744,7 +1744,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1761,7 +1761,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -2684,7 +2683,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -2717,7 +2716,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
diff --git a/projects/plugins/jetpack/extensions/blocks/sharing-button/sharing-button.php b/projects/plugins/jetpack/extensions/blocks/sharing-button/sharing-button.php
index 776f6568a4b84..5c9e6dd8cad0c 100644
--- a/projects/plugins/jetpack/extensions/blocks/sharing-button/sharing-button.php
+++ b/projects/plugins/jetpack/extensions/blocks/sharing-button/sharing-button.php
@@ -269,12 +269,6 @@ function add_block_to_single_posts_template( $hooked_block_types, $relative_posi
return $hooked_block_types;
}
- $content = $context->content ?? '';
- // Check if the block is already in the template. If so, abort.
- if ( false !== strpos( $content, 'wp:' . PARENT_BLOCK_NAME ) ) {
- return $hooked_block_types;
- }
-
$hooked_block_types[] = PARENT_BLOCK_NAME;
return $hooked_block_types;
}
diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
index 22dd84e279459..42b541afa2440 100644
--- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php
@@ -85,6 +85,7 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint {
'wpcom_site_setup' => '(string) The WP.com site setup identifier.',
'is_deleted' => '(bool) If the site flagged as deleted.',
'is_a4a_client' => '(bool) If the site is an A4A client site.',
+ 'is_a4a_dev_site' => '(bool) If the site is an A4A dev site.',
);
/**
@@ -120,6 +121,7 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint {
'is_wpcom_staging_site',
'is_deleted',
'is_a4a_client',
+ 'is_a4a_dev_site',
);
/**
@@ -612,6 +614,9 @@ protected function render_response_key( $key, &$response, $is_user_logged_in ) {
case 'is_a4a_client':
$response[ $key ] = $this->site->is_a4a_client();
break;
+ case 'is_a4a_dev_site':
+ $response[ $key ] = $this->site->is_a4a_dev_site();
+ break;
}
do_action( 'post_render_site_response_key', $key );
diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
index bb1f734d82881..0b21388d1e6ce 100644
--- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-v1-2-endpoint.php
@@ -79,6 +79,7 @@ class WPCOM_JSON_API_GET_Site_V1_2_Endpoint extends WPCOM_JSON_API_GET_Site_Endp
'was_hosting_trial' => '(bool) If the site ever used a hosting trial.',
'is_deleted' => '(bool) If the site flagged as deleted.',
'is_a4a_client' => '(bool) If the site is an A4A client site.',
+ 'is_a4a_dev_site' => '(bool) If the site is an A4A dev site.',
);
/**
diff --git a/projects/plugins/jetpack/modules/masterbar.php b/projects/plugins/jetpack/modules/masterbar.php
index d5493b8714c7f..62e0a5e3c1578 100644
--- a/projects/plugins/jetpack/modules/masterbar.php
+++ b/projects/plugins/jetpack/modules/masterbar.php
@@ -14,6 +14,11 @@
* @package automattic/jetpack
*/
-use Automattic\Jetpack\Masterbar\Main as Jetpack_Masterbar;
-
-Jetpack_Masterbar::init();
+/**
+ * Remove Masterbar from the old Module list.
+ * Available at wp-admin/admin.php?page=jetpack_modules
+ * We only need this function and module file until the Masterbar is fully removed from Jetpack including notices).
+ *
+ * @param array $items Array of Jetpack modules.
+ * @return array
+ */
diff --git a/projects/plugins/jetpack/modules/theme-tools/social-menu/social-menu.svg b/projects/plugins/jetpack/modules/theme-tools/social-menu/social-menu.svg
index 5beac331dd9fe..9d51b1ad99267 100644
--- a/projects/plugins/jetpack/modules/theme-tools/social-menu/social-menu.svg
+++ b/projects/plugins/jetpack/modules/theme-tools/social-menu/social-menu.svg
@@ -1 +1,257 @@
-
\ No newline at end of file
+
diff --git a/projects/plugins/jetpack/modules/widgets/social-icons.php b/projects/plugins/jetpack/modules/widgets/social-icons.php
index 79cda62197aa6..940b52e2a71a7 100644
--- a/projects/plugins/jetpack/modules/widgets/social-icons.php
+++ b/projects/plugins/jetpack/modules/widgets/social-icons.php
@@ -116,10 +116,10 @@ public function render_admin_js() {
public function include_svg_icons() {
// Define SVG sprite file in Jetpack.
$svg_icons = dirname( __DIR__ ) . '/theme-tools/social-menu/social-menu.svg';
- $svg_icons = class_exists( 'Automattic\Jetpack\Classic_Theme_Helper\Main' ) ? JETPACK__PLUGIN_DIR . 'jetpack-vendor/automattic/jetpack-classic-theme-helper/src/social-menu/social-menu.svg' : dirname( __DIR__ ) . '/theme-tools/social-menu/social-menu.svg';
+ $svg_icons = class_exists( 'Automattic\Jetpack\Classic_Theme_Helper\Main' ) ? JETPACK__PLUGIN_DIR . 'jetpack_vendor/automattic/jetpack-classic-theme-helper/src/social-menu/social-menu.svg' : dirname( __DIR__ ) . '/theme-tools/social-menu/social-menu.svg';
// Define SVG sprite file in WPCOM.
if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
- $svg_icons = class_exists( 'Automattic\Jetpack\Classic_Theme_Helper\Main' ) ? JETPACK__PLUGIN_DIR . 'jetpack-vendor/automattic/jetpack-classic-theme-helper/src/social-menu/social-menu.svg' : dirname( __DIR__ ) . '/social-menu/social-menu.svg';
+ $svg_icons = class_exists( 'Automattic\Jetpack\Classic_Theme_Helper\Main' ) ? JETPACK__PLUGIN_DIR . 'jetpack_vendor/automattic/jetpack-classic-theme-helper/src/social-menu/social-menu.svg' : dirname( __DIR__ ) . '/social-menu/social-menu.svg';
}
// If it exists, include it.
diff --git a/projects/plugins/jetpack/sal/class.json-api-site-base.php b/projects/plugins/jetpack/sal/class.json-api-site-base.php
index 40925db17215e..8109037452d83 100644
--- a/projects/plugins/jetpack/sal/class.json-api-site-base.php
+++ b/projects/plugins/jetpack/sal/class.json-api-site-base.php
@@ -423,6 +423,18 @@ abstract public function is_deleted();
*/
abstract public function is_a4a_client();
+ /**
+ * Indicates that a site is an A4A dev site.
+ *
+ * @return bool
+ */
+ public function is_a4a_dev_site() {
+ if ( function_exists( 'has_blog_sticker' ) ) {
+ return has_blog_sticker( 'a4a-is-dev-site' );
+ }
+ return false;
+ }
+
/**
* Return the user interactions with a site. Not used in Jetpack.
*
diff --git a/projects/plugins/jetpack/src/class-deprecate.php b/projects/plugins/jetpack/src/class-deprecate.php
index 4a106f6bcb206..8837c02e30a4c 100644
--- a/projects/plugins/jetpack/src/class-deprecate.php
+++ b/projects/plugins/jetpack/src/class-deprecate.php
@@ -31,6 +31,7 @@ private function __construct() {
add_action( 'admin_notices', array( $this, 'render_admin_notices' ) );
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
add_filter( 'my_jetpack_red_bubble_notification_slugs', array( $this, 'add_my_jetpack_red_bubbles' ) );
+ add_filter( 'jetpack_modules_list_table_items', array( $this, 'remove_masterbar_module_list' ) );
}
/**
@@ -70,7 +71,7 @@ public function enqueue_admin_scripts() {
}
/**
- * Render Google Analytics deprecation notice.
+ * Render deprecation notices for relevant features.
*
* @return void
*/
@@ -84,6 +85,15 @@ public function render_admin_notices() {
. ' ' . esc_html__( 'To keep tracking visits and more information on this change, please refer to this document', 'jetpack' ) . '.'
);
}
+ if ( $this->show_masterbar_notice() ) {
+ $support_url = Redirect::get_url( 'jetpack-support-masterbar' );
+
+ $this->render_notice(
+ 'jetpack-masterbar-admin-removal-notice',
+ esc_html__( "Jetpack's WordPress.com Toolbar feature has been removed.", 'jetpack' )
+ . ' ' . esc_html__( 'To find out more about what this means for you, please refer to this document', 'jetpack' ) . '.'
+ );
+ }
}
/**
@@ -106,6 +116,18 @@ public function add_my_jetpack_red_bubbles( $slugs ) {
),
);
}
+ if ( $this->show_masterbar_notice() ) {
+ $slugs['jetpack-masterbar-deprecate-feature'] = array(
+ 'data' => array(
+ 'text' => __( "Jetpack's WordPress.com Toolbar feature has been removed.", 'jetpack' ),
+ 'link' => array(
+ 'label' => esc_html__( 'See documentation', 'jetpack' ),
+ 'url' => Redirect::get_url( 'jetpack-support-masterbar' ),
+ ),
+ 'id' => 'jetpack-masterbar-admin-removal-notice',
+ ),
+ );
+ }
return $slugs;
}
@@ -151,7 +173,7 @@ private function render_notice( $id, $text, $params = array() ) {
* @return bool
*/
private function has_notices() {
- return $this->show_ga_notice();
+ return ( $this->show_ga_notice() || $this->show_masterbar_notice() );
}
/**
@@ -165,4 +187,30 @@ private function show_ga_notice() {
&& ! ( new Host() )->is_woa_site()
&& empty( $_COOKIE['jetpack_deprecate_dismissed']['jetpack-ga-admin-removal-notice'] );
}
+
+ /**
+ * Check if Masterbar notice should show up.
+ *
+ * @return bool
+ */
+ private function show_masterbar_notice() {
+ return ( new Modules() )->is_active( 'masterbar', false )
+ && ! ( new Host() )->is_woa_site()
+ && empty( $_COOKIE['jetpack_deprecate_dismissed']['jetpack-masterbar-admin-removal-notice'] );
+ }
+
+ /**
+ * Remove Masterbar from the old Module list.
+ * Available at wp-admin/admin.php?page=jetpack_modules
+ * We only need this function until the Masterbar is fully removed from Jetpack (including notices).
+ *
+ * @param array $items Array of Jetpack modules.
+ * @return array
+ */
+ public function remove_masterbar_module_list( $items ) {
+ if ( isset( $items['masterbar'] ) && get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
+ unset( $items['masterbar'] );
+ }
+ return $items;
+ }
}
diff --git a/projects/plugins/migration/changelog/add-filter-for-filtered-order-data b/projects/plugins/migration/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/migration/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/migration/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
index 6069f7243a6aa..83b08ff4e171d 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -1160,7 +1160,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1177,7 +1177,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1741,7 +1740,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1774,7 +1773,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
@@ -1809,128 +1808,6 @@
"transport-options": {
"relative": true
}
- },
- {
- "name": "automattic/jetpack-waf",
- "version": "dev-trunk",
- "dist": {
- "type": "path",
- "url": "../../packages/waf",
- "reference": "6e2fd903a4dc024db95b51904989506f65013e0e"
- },
- "require": {
- "automattic/jetpack-connection": "@dev",
- "automattic/jetpack-constants": "@dev",
- "automattic/jetpack-ip": "@dev",
- "automattic/jetpack-status": "@dev",
- "php": ">=7.0",
- "wikimedia/aho-corasick": "^1.0"
- },
- "require-dev": {
- "automattic/jetpack-changelogger": "@dev",
- "automattic/wordbless": "@dev",
- "yoast/phpunit-polyfills": "1.1.0"
- },
- "suggest": {
- "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
- },
- "type": "jetpack-library",
- "extra": {
- "autotagger": true,
- "mirror-repo": "Automattic/jetpack-waf",
- "textdomain": "jetpack-waf",
- "changelogger": {
- "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
- },
- "branch-alias": {
- "dev-trunk": "0.18.x-dev"
- }
- },
- "autoload": {
- "files": [
- "cli.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "scripts": {
- "phpunit": [
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
- ],
- "post-install-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "post-update-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "test-coverage-html": [
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
- ],
- "test-php": [
- "@composer phpunit"
- ]
- },
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "Tools to assist with the Jetpack Web Application Firewall",
- "transport-options": {
- "relative": true
- }
- },
- {
- "name": "wikimedia/aho-corasick",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/AhoCorasick.git",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/wikimedia/AhoCorasick/zipball/2f3a1bd765913637a66eade658d11d82f0e551be",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "1.0.0",
- "mediawiki/mediawiki-codesniffer": "18.0.0",
- "mediawiki/minus-x": "0.3.1",
- "phpunit/phpunit": "4.8.36 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "ori@wikimedia.org"
- }
- ],
- "description": "An implementation of the Aho-Corasick string matching algorithm.",
- "homepage": "https://gerrit.wikimedia.org/g/AhoCorasick",
- "keywords": [
- "ahocorasick",
- "matcher"
- ],
- "support": {
- "source": "https://github.com/wikimedia/AhoCorasick/tree/v1.0.1"
- },
- "time": "2018-05-01T18:13:32+00:00"
}
],
"packages-dev": [
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-filter-for-filtered-order-data b/projects/plugins/mu-wpcom-plugin/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/atomic-default-profile b/projects/plugins/mu-wpcom-plugin/changelog/atomic-default-profile
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/atomic-default-profile
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
index d78c95da25044..c24fbd19b039f 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.lock
+++ b/projects/plugins/mu-wpcom-plugin/composer.lock
@@ -926,7 +926,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "9f21b1d7607b21df7becfcdb49002d310d891440"
+ "reference": "39a207e6ee97aa176b4198439f5b7e8bc911ef87"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -954,7 +954,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.6.x-dev"
+ "dev-trunk": "0.7.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
@@ -1506,7 +1506,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1539,7 +1539,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
diff --git a/projects/plugins/protect/.phan/baseline.php b/projects/plugins/protect/.phan/baseline.php
index d7eb69a5f7082..fba380eb870a7 100644
--- a/projects/plugins/protect/.phan/baseline.php
+++ b/projects/plugins/protect/.phan/baseline.php
@@ -19,7 +19,6 @@
'jetpack-protect.php' => ['PhanNoopNew'],
'src/class-credentials.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
'src/class-rest-controller.php' => ['PhanParamTooMany'],
- 'src/class-threats.php' => ['PhanParamTooMany'],
],
// 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
// (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)
diff --git a/projects/plugins/protect/.w.org-assets/screenshot-2.png b/projects/plugins/protect/.w.org-assets/screenshot-2.png
index c06d4e02cde45..7bc75fdad17e9 100644
Binary files a/projects/plugins/protect/.w.org-assets/screenshot-2.png and b/projects/plugins/protect/.w.org-assets/screenshot-2.png differ
diff --git a/projects/plugins/protect/changelog/add-filter-for-filtered-order-data b/projects/plugins/protect/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/changelog/add-protect-hide-autofix-col b/projects/plugins/protect/changelog/add-protect-hide-autofix-col
new file mode 100644
index 0000000000000..4273dddc0151c
--- /dev/null
+++ b/projects/plugins/protect/changelog/add-protect-hide-autofix-col
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Protect Threat History: remove auto-fix column as it is not applicable to history.
+
+
diff --git a/projects/plugins/protect/changelog/fix-protect-delete-relevant-options-on-deactivation b/projects/plugins/protect/changelog/fix-protect-delete-relevant-options-on-deactivation
new file mode 100644
index 0000000000000..0516b98097e45
--- /dev/null
+++ b/projects/plugins/protect/changelog/fix-protect-delete-relevant-options-on-deactivation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Delete relevant Protect options on deactivation
diff --git a/projects/plugins/protect/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/protect/changelog/try-lossless-image-optmization-part-3
new file mode 100644
index 0000000000000..cf77a8b55bb43
--- /dev/null
+++ b/projects/plugins/protect/changelog/try-lossless-image-optmization-part-3
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/protect/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/protect/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index 91794382c7784..8302711f79c69 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -1073,7 +1073,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1090,7 +1090,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1654,7 +1653,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1687,7 +1686,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
diff --git a/projects/plugins/protect/src/class-jetpack-protect.php b/projects/plugins/protect/src/class-jetpack-protect.php
index ff0aaa9581158..300886a9bed03 100644
--- a/projects/plugins/protect/src/class-jetpack-protect.php
+++ b/projects/plugins/protect/src/class-jetpack-protect.php
@@ -24,6 +24,8 @@
use Automattic\Jetpack\Protect\Scan_History;
use Automattic\Jetpack\Protect\Site_Health;
use Automattic\Jetpack\Protect_Status\Plan;
+use Automattic\Jetpack\Protect_Status\Protect_Status;
+use Automattic\Jetpack\Protect_Status\Scan_Status;
use Automattic\Jetpack\Protect_Status\Status;
use Automattic\Jetpack\Status as Jetpack_Status;
use Automattic\Jetpack\Sync\Functions as Sync_Functions;
@@ -296,7 +298,9 @@ public static function plugin_deactivation() {
$manager = new Connection_Manager( 'jetpack-protect' );
$manager->remove_connection();
- Status::delete_option();
+ Protect_Status::delete_option();
+ Scan_Status::delete_option();
+ Scan_History::delete_option();
}
/**
diff --git a/projects/plugins/protect/src/class-threats.php b/projects/plugins/protect/src/class-threats.php
index f2a80999f65f9..db71aaa75ef68 100644
--- a/projects/plugins/protect/src/class-threats.php
+++ b/projects/plugins/protect/src/class-threats.php
@@ -44,7 +44,7 @@ private static function get_api_base() {
* @return bool
*/
public static function update_threat( $threat_id, $updates ) {
- $api_base = self::get_api_base( $threat_id );
+ $api_base = self::get_api_base();
if ( is_wp_error( $api_base ) ) {
return false;
}
diff --git a/projects/plugins/protect/src/js/components/paid-accordion/index.jsx b/projects/plugins/protect/src/js/components/paid-accordion/index.jsx
index adfc8ddad213c..5264208ed34e8 100644
--- a/projects/plugins/protect/src/js/components/paid-accordion/index.jsx
+++ b/projects/plugins/protect/src/js/components/paid-accordion/index.jsx
@@ -70,6 +70,7 @@ export const PaidAccordionItem = ( {
fixedOn,
onOpen,
status,
+ hideAutoFixColumn = false,
} ) => {
const accordionData = useContext( PaidAccordionContext );
const open = accordionData?.open === id;
@@ -117,18 +118,20 @@ export const PaidAccordionItem = ( {
-
- { fixable && (
- <>
- { threatsAreFixing.indexOf( id ) >= 0 ? (
-
- ) : (
-
- ) }
- { isSmall && { __( 'Auto-fix', 'jetpack-protect' ) } }
-
- ) }
-
+ { ! hideAutoFixColumn && (
+
+ { fixable && (
+ <>
+ { threatsAreFixing.indexOf( id ) >= 0 ? (
+
+ ) : (
+
+ ) }
+ { isSmall && { __( 'Auto-fix', 'jetpack-protect' ) } }
+
+ ) }
+
+ ) }
diff --git a/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx b/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx
index 10ecb1781f8f4..24cbd217c74d8 100644
--- a/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx
+++ b/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx
@@ -27,6 +27,7 @@ const ThreatAccordionItem = ( {
type,
severity,
status,
+ hideAutoFixColumn = false,
} ) => {
const threatsAreFixing = useSelect( select => select( STORE_ID ).getThreatsAreFixing() );
const { setModal } = useDispatch( STORE_ID );
@@ -87,6 +88,7 @@ const ThreatAccordionItem = ( {
}
recordEvent( `jetpack_protect_${ type }_threat_open` );
}, [ recordEvent, type ] ) }
+ hideAutoFixColumn={ hideAutoFixColumn }
>
{ description && (
@@ -135,39 +137,41 @@ const ThreatAccordionItem = ( {
) }
{ ! description && { learnMoreButton }
}
-
- { 'ignored' === status && (
-
- ) }
- { 'current' === status && (
- <>
+ { [ 'ignored', 'current' ].includes( status ) && (
+
+ { 'ignored' === status && (
- { fixable && (
-
+ { fixable && (
+
+ ) }
+
+ ) }
+
{ __( 'Details', 'jetpack-protect' ) }
{ __( 'Severity', 'jetpack-protect' ) }
- { __( 'Auto-fix', 'jetpack-protect' ) }
+ { ! hideAutoFixColumn && { __( 'Auto-fix', 'jetpack-protect' ) } }
) }
@@ -224,6 +228,7 @@ const PaidList = ( { list } ) => {
type={ type }
version={ version }
status={ status }
+ hideAutoFixColumn={ hideAutoFixColumn }
/>
)
) }
diff --git a/projects/plugins/protect/src/js/routes/firewall/index.jsx b/projects/plugins/protect/src/js/routes/firewall/index.jsx
index 17a8289537664..4af9d28a64ddb 100644
--- a/projects/plugins/protect/src/js/routes/firewall/index.jsx
+++ b/projects/plugins/protect/src/js/routes/firewall/index.jsx
@@ -708,19 +708,12 @@ const FirewallPage = () => {
onChange={ handleChange }
disabled={ ! canEditFirewallSettings || ! ipBlockListEnabled }
/>
-
- { __(
- 'By adding their IP addresses, you ensure they will never access your site.',
- 'jetpack-protect'
- ) }
-
) }
{ ipBlockListEnabled && (
-
+
) : (
<>
diff --git a/projects/plugins/search/changelog/add-filter-for-filtered-order-data b/projects/plugins/search/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/search/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/search/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/search/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
index 6fcf265a304f2..7b3759662a2e6 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -1016,7 +1016,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1033,7 +1033,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1746,7 +1745,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1779,7 +1778,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
@@ -1814,128 +1813,6 @@
"transport-options": {
"relative": true
}
- },
- {
- "name": "automattic/jetpack-waf",
- "version": "dev-trunk",
- "dist": {
- "type": "path",
- "url": "../../packages/waf",
- "reference": "6e2fd903a4dc024db95b51904989506f65013e0e"
- },
- "require": {
- "automattic/jetpack-connection": "@dev",
- "automattic/jetpack-constants": "@dev",
- "automattic/jetpack-ip": "@dev",
- "automattic/jetpack-status": "@dev",
- "php": ">=7.0",
- "wikimedia/aho-corasick": "^1.0"
- },
- "require-dev": {
- "automattic/jetpack-changelogger": "@dev",
- "automattic/wordbless": "@dev",
- "yoast/phpunit-polyfills": "1.1.0"
- },
- "suggest": {
- "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
- },
- "type": "jetpack-library",
- "extra": {
- "autotagger": true,
- "mirror-repo": "Automattic/jetpack-waf",
- "textdomain": "jetpack-waf",
- "changelogger": {
- "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
- },
- "branch-alias": {
- "dev-trunk": "0.18.x-dev"
- }
- },
- "autoload": {
- "files": [
- "cli.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "scripts": {
- "phpunit": [
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
- ],
- "post-install-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "post-update-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "test-coverage-html": [
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
- ],
- "test-php": [
- "@composer phpunit"
- ]
- },
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "Tools to assist with the Jetpack Web Application Firewall",
- "transport-options": {
- "relative": true
- }
- },
- {
- "name": "wikimedia/aho-corasick",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/AhoCorasick.git",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/wikimedia/AhoCorasick/zipball/2f3a1bd765913637a66eade658d11d82f0e551be",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "1.0.0",
- "mediawiki/mediawiki-codesniffer": "18.0.0",
- "mediawiki/minus-x": "0.3.1",
- "phpunit/phpunit": "4.8.36 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "ori@wikimedia.org"
- }
- ],
- "description": "An implementation of the Aho-Corasick string matching algorithm.",
- "homepage": "https://gerrit.wikimedia.org/g/AhoCorasick",
- "keywords": [
- "ahocorasick",
- "matcher"
- ],
- "support": {
- "source": "https://github.com/wikimedia/AhoCorasick/tree/v1.0.1"
- },
- "time": "2018-05-01T18:13:32+00:00"
}
],
"packages-dev": [
diff --git a/projects/plugins/social/changelog/add-filter-for-filtered-order-data b/projects/plugins/social/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/social/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/social/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index f2bcd31f74bc9..71a8cec7c7221 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -1016,7 +1016,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1033,7 +1033,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1737,7 +1736,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1770,7 +1769,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
@@ -1805,128 +1804,6 @@
"transport-options": {
"relative": true
}
- },
- {
- "name": "automattic/jetpack-waf",
- "version": "dev-trunk",
- "dist": {
- "type": "path",
- "url": "../../packages/waf",
- "reference": "6e2fd903a4dc024db95b51904989506f65013e0e"
- },
- "require": {
- "automattic/jetpack-connection": "@dev",
- "automattic/jetpack-constants": "@dev",
- "automattic/jetpack-ip": "@dev",
- "automattic/jetpack-status": "@dev",
- "php": ">=7.0",
- "wikimedia/aho-corasick": "^1.0"
- },
- "require-dev": {
- "automattic/jetpack-changelogger": "@dev",
- "automattic/wordbless": "@dev",
- "yoast/phpunit-polyfills": "1.1.0"
- },
- "suggest": {
- "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
- },
- "type": "jetpack-library",
- "extra": {
- "autotagger": true,
- "mirror-repo": "Automattic/jetpack-waf",
- "textdomain": "jetpack-waf",
- "changelogger": {
- "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
- },
- "branch-alias": {
- "dev-trunk": "0.18.x-dev"
- }
- },
- "autoload": {
- "files": [
- "cli.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "scripts": {
- "phpunit": [
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
- ],
- "post-install-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "post-update-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "test-coverage-html": [
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
- ],
- "test-php": [
- "@composer phpunit"
- ]
- },
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "Tools to assist with the Jetpack Web Application Firewall",
- "transport-options": {
- "relative": true
- }
- },
- {
- "name": "wikimedia/aho-corasick",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/AhoCorasick.git",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/wikimedia/AhoCorasick/zipball/2f3a1bd765913637a66eade658d11d82f0e551be",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "1.0.0",
- "mediawiki/mediawiki-codesniffer": "18.0.0",
- "mediawiki/minus-x": "0.3.1",
- "phpunit/phpunit": "4.8.36 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "ori@wikimedia.org"
- }
- ],
- "description": "An implementation of the Aho-Corasick string matching algorithm.",
- "homepage": "https://gerrit.wikimedia.org/g/AhoCorasick",
- "keywords": [
- "ahocorasick",
- "matcher"
- ],
- "support": {
- "source": "https://github.com/wikimedia/AhoCorasick/tree/v1.0.1"
- },
- "time": "2018-05-01T18:13:32+00:00"
}
],
"packages-dev": [
diff --git a/projects/plugins/starter-plugin/changelog/add-filter-for-filtered-order-data b/projects/plugins/starter-plugin/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/starter-plugin/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
index 541a185a2fd8c..d3e18dd6ae524 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -1016,7 +1016,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1033,7 +1033,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1597,7 +1596,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1630,7 +1629,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
@@ -1665,128 +1664,6 @@
"transport-options": {
"relative": true
}
- },
- {
- "name": "automattic/jetpack-waf",
- "version": "dev-trunk",
- "dist": {
- "type": "path",
- "url": "../../packages/waf",
- "reference": "6e2fd903a4dc024db95b51904989506f65013e0e"
- },
- "require": {
- "automattic/jetpack-connection": "@dev",
- "automattic/jetpack-constants": "@dev",
- "automattic/jetpack-ip": "@dev",
- "automattic/jetpack-status": "@dev",
- "php": ">=7.0",
- "wikimedia/aho-corasick": "^1.0"
- },
- "require-dev": {
- "automattic/jetpack-changelogger": "@dev",
- "automattic/wordbless": "@dev",
- "yoast/phpunit-polyfills": "1.1.0"
- },
- "suggest": {
- "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
- },
- "type": "jetpack-library",
- "extra": {
- "autotagger": true,
- "mirror-repo": "Automattic/jetpack-waf",
- "textdomain": "jetpack-waf",
- "changelogger": {
- "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
- },
- "branch-alias": {
- "dev-trunk": "0.18.x-dev"
- }
- },
- "autoload": {
- "files": [
- "cli.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "scripts": {
- "phpunit": [
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
- ],
- "post-install-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "post-update-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "test-coverage-html": [
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
- ],
- "test-php": [
- "@composer phpunit"
- ]
- },
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "Tools to assist with the Jetpack Web Application Firewall",
- "transport-options": {
- "relative": true
- }
- },
- {
- "name": "wikimedia/aho-corasick",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/AhoCorasick.git",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/wikimedia/AhoCorasick/zipball/2f3a1bd765913637a66eade658d11d82f0e551be",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "1.0.0",
- "mediawiki/mediawiki-codesniffer": "18.0.0",
- "mediawiki/minus-x": "0.3.1",
- "phpunit/phpunit": "4.8.36 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "ori@wikimedia.org"
- }
- ],
- "description": "An implementation of the Aho-Corasick string matching algorithm.",
- "homepage": "https://gerrit.wikimedia.org/g/AhoCorasick",
- "keywords": [
- "ahocorasick",
- "matcher"
- ],
- "support": {
- "source": "https://github.com/wikimedia/AhoCorasick/tree/v1.0.1"
- },
- "time": "2018-05-01T18:13:32+00:00"
}
],
"packages-dev": [
diff --git a/projects/plugins/super-cache/.w.org-assets/banner-1544x500.png b/projects/plugins/super-cache/.w.org-assets/banner-1544x500.png
index d9be6f8b277ad..f70052f328ff1 100644
Binary files a/projects/plugins/super-cache/.w.org-assets/banner-1544x500.png and b/projects/plugins/super-cache/.w.org-assets/banner-1544x500.png differ
diff --git a/projects/plugins/super-cache/.w.org-assets/banner-772x250.png b/projects/plugins/super-cache/.w.org-assets/banner-772x250.png
index 78116be2c0b30..87927d0f634e5 100644
Binary files a/projects/plugins/super-cache/.w.org-assets/banner-772x250.png and b/projects/plugins/super-cache/.w.org-assets/banner-772x250.png differ
diff --git a/projects/plugins/super-cache/.w.org-assets/icon-128x128.png b/projects/plugins/super-cache/.w.org-assets/icon-128x128.png
index 30f3c65c1dacc..69890897d48c6 100644
Binary files a/projects/plugins/super-cache/.w.org-assets/icon-128x128.png and b/projects/plugins/super-cache/.w.org-assets/icon-128x128.png differ
diff --git a/projects/plugins/super-cache/.w.org-assets/icon-256x256.png b/projects/plugins/super-cache/.w.org-assets/icon-256x256.png
index 495ed8c03405e..a8f950ead2149 100644
Binary files a/projects/plugins/super-cache/.w.org-assets/icon-256x256.png and b/projects/plugins/super-cache/.w.org-assets/icon-256x256.png differ
diff --git a/projects/plugins/super-cache/assets/automattic-airline.svg b/projects/plugins/super-cache/assets/automattic-airline.svg
index f092fca286c7a..7142a47aeadb5 100644
--- a/projects/plugins/super-cache/assets/automattic-airline.svg
+++ b/projects/plugins/super-cache/assets/automattic-airline.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/super-cache/assets/boost-install-card-main-2x.png b/projects/plugins/super-cache/assets/boost-install-card-main-2x.png
index 44282711022d7..7c4faa6dba38e 100644
Binary files a/projects/plugins/super-cache/assets/boost-install-card-main-2x.png and b/projects/plugins/super-cache/assets/boost-install-card-main-2x.png differ
diff --git a/projects/plugins/super-cache/assets/boost-install-card-main.png b/projects/plugins/super-cache/assets/boost-install-card-main.png
index 9734ff0d0f3c7..7a925d93a787a 100644
Binary files a/projects/plugins/super-cache/assets/boost-install-card-main.png and b/projects/plugins/super-cache/assets/boost-install-card-main.png differ
diff --git a/projects/plugins/super-cache/assets/jetpack-colors.svg b/projects/plugins/super-cache/assets/jetpack-colors.svg
index 2b4b45f483cb1..74eced3b128ec 100644
--- a/projects/plugins/super-cache/assets/jetpack-colors.svg
+++ b/projects/plugins/super-cache/assets/jetpack-colors.svg
@@ -1,14 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/projects/plugins/super-cache/assets/jetpack-logo.svg b/projects/plugins/super-cache/assets/jetpack-logo.svg
index af8a87cb549db..4ad3e67989baf 100644
--- a/projects/plugins/super-cache/assets/jetpack-logo.svg
+++ b/projects/plugins/super-cache/assets/jetpack-logo.svg
@@ -1,17 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/super-cache/assets/super-cache-icon.png b/projects/plugins/super-cache/assets/super-cache-icon.png
index 495ed8c03405e..a8f950ead2149 100644
Binary files a/projects/plugins/super-cache/assets/super-cache-icon.png and b/projects/plugins/super-cache/assets/super-cache-icon.png differ
diff --git a/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3
new file mode 100644
index 0000000000000..cf77a8b55bb43
--- /dev/null
+++ b/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/vaultpress/.w.org-assets/banner-1544x500.png b/projects/plugins/vaultpress/.w.org-assets/banner-1544x500.png
index d55352206f5d9..c122469999123 100644
Binary files a/projects/plugins/vaultpress/.w.org-assets/banner-1544x500.png and b/projects/plugins/vaultpress/.w.org-assets/banner-1544x500.png differ
diff --git a/projects/plugins/vaultpress/.w.org-assets/icon-128x128.png b/projects/plugins/vaultpress/.w.org-assets/icon-128x128.png
index 325274e89ec20..449252c345c73 100644
Binary files a/projects/plugins/vaultpress/.w.org-assets/icon-128x128.png and b/projects/plugins/vaultpress/.w.org-assets/icon-128x128.png differ
diff --git a/projects/plugins/vaultpress/.w.org-assets/icon-256x256.png b/projects/plugins/vaultpress/.w.org-assets/icon-256x256.png
index 70c6e044d31b2..9f832af9adf6a 100644
Binary files a/projects/plugins/vaultpress/.w.org-assets/icon-256x256.png and b/projects/plugins/vaultpress/.w.org-assets/icon-256x256.png differ
diff --git a/projects/plugins/vaultpress/.w.org-assets/icon.svg b/projects/plugins/vaultpress/.w.org-assets/icon.svg
index 21c83aad5244b..6e6691439980e 100644
--- a/projects/plugins/vaultpress/.w.org-assets/icon.svg
+++ b/projects/plugins/vaultpress/.w.org-assets/icon.svg
@@ -1,20 +1 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3
new file mode 100644
index 0000000000000..cf77a8b55bb43
--- /dev/null
+++ b/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/vaultpress/fonts/vaultpress-regular.svg b/projects/plugins/vaultpress/fonts/vaultpress-regular.svg
index 7cf2d86537bd3..52f5d1273f333 100755
--- a/projects/plugins/vaultpress/fonts/vaultpress-regular.svg
+++ b/projects/plugins/vaultpress/fonts/vaultpress-regular.svg
@@ -1,12 +1 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/projects/plugins/vaultpress/images/automattic.svg b/projects/plugins/vaultpress/images/automattic.svg
index 312799fc8ae80..369955e7cd969 100644
--- a/projects/plugins/vaultpress/images/automattic.svg
+++ b/projects/plugins/vaultpress/images/automattic.svg
@@ -1,7 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/vaultpress/images/dashboard-icon-sprite-2x.png b/projects/plugins/vaultpress/images/dashboard-icon-sprite-2x.png
index de1d7c3bf7be1..25527b860d0d9 100644
Binary files a/projects/plugins/vaultpress/images/dashboard-icon-sprite-2x.png and b/projects/plugins/vaultpress/images/dashboard-icon-sprite-2x.png differ
diff --git a/projects/plugins/vaultpress/images/logo_plugin-notice.png b/projects/plugins/vaultpress/images/logo_plugin-notice.png
index 9c9b13f40df5b..18079b65d0c11 100644
Binary files a/projects/plugins/vaultpress/images/logo_plugin-notice.png and b/projects/plugins/vaultpress/images/logo_plugin-notice.png differ
diff --git a/projects/plugins/vaultpress/images/security.svg b/projects/plugins/vaultpress/images/security.svg
index a790c607372ae..5bbdaa2188ac6 100644
--- a/projects/plugins/vaultpress/images/security.svg
+++ b/projects/plugins/vaultpress/images/security.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/vaultpress/images/vaultpress.svg b/projects/plugins/vaultpress/images/vaultpress.svg
index cb72276adb83f..ca8e7d3249092 100644
--- a/projects/plugins/vaultpress/images/vaultpress.svg
+++ b/projects/plugins/vaultpress/images/vaultpress.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/vaultpress/images/vp-icon-sprite-2x.png b/projects/plugins/vaultpress/images/vp-icon-sprite-2x.png
index 36846c21b0183..f0dc0db5b528a 100644
Binary files a/projects/plugins/vaultpress/images/vp-icon-sprite-2x.png and b/projects/plugins/vaultpress/images/vp-icon-sprite-2x.png differ
diff --git a/projects/plugins/vaultpress/images/vp-icon-sprite.png b/projects/plugins/vaultpress/images/vp-icon-sprite.png
index e525eaecb8b76..78c717e572beb 100644
Binary files a/projects/plugins/vaultpress/images/vp-icon-sprite.png and b/projects/plugins/vaultpress/images/vp-icon-sprite.png differ
diff --git a/projects/plugins/vaultpress/images/vp-toolbar-icon-trans-2x.png b/projects/plugins/vaultpress/images/vp-toolbar-icon-trans-2x.png
index 0cb57e6156b82..c7455ce619f2a 100644
Binary files a/projects/plugins/vaultpress/images/vp-toolbar-icon-trans-2x.png and b/projects/plugins/vaultpress/images/vp-toolbar-icon-trans-2x.png differ
diff --git a/projects/plugins/vaultpress/images/vp-toolbar-icon-trans.png b/projects/plugins/vaultpress/images/vp-toolbar-icon-trans.png
index 757b0bb402b4b..8007395d4b4cb 100644
Binary files a/projects/plugins/vaultpress/images/vp-toolbar-icon-trans.png and b/projects/plugins/vaultpress/images/vp-toolbar-icon-trans.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/banner-1544x500.png b/projects/plugins/videopress/.w.org-assets/banner-1544x500.png
index 76435009e73bc..5da9393331eeb 100644
Binary files a/projects/plugins/videopress/.w.org-assets/banner-1544x500.png and b/projects/plugins/videopress/.w.org-assets/banner-1544x500.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/banner-772-250.png b/projects/plugins/videopress/.w.org-assets/banner-772-250.png
index d44ba36c86735..af15fb9f0fccc 100644
Binary files a/projects/plugins/videopress/.w.org-assets/banner-772-250.png and b/projects/plugins/videopress/.w.org-assets/banner-772-250.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/icon-128x128.png b/projects/plugins/videopress/.w.org-assets/icon-128x128.png
index 30de260d48c1d..0d6da28c70d7c 100644
Binary files a/projects/plugins/videopress/.w.org-assets/icon-128x128.png and b/projects/plugins/videopress/.w.org-assets/icon-128x128.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/icon-256x256.png b/projects/plugins/videopress/.w.org-assets/icon-256x256.png
index 8c2d7db95f3d9..bcbdf2be26279 100644
Binary files a/projects/plugins/videopress/.w.org-assets/icon-256x256.png and b/projects/plugins/videopress/.w.org-assets/icon-256x256.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/icon.svg b/projects/plugins/videopress/.w.org-assets/icon.svg
index 512722f49f968..7fbb8b64c2239 100644
--- a/projects/plugins/videopress/.w.org-assets/icon.svg
+++ b/projects/plugins/videopress/.w.org-assets/icon.svg
@@ -1,14 +1 @@
-
+
\ No newline at end of file
diff --git a/projects/plugins/videopress/.w.org-assets/screenshot-1.png b/projects/plugins/videopress/.w.org-assets/screenshot-1.png
index 781a56383b4ae..094f3fefdb273 100644
Binary files a/projects/plugins/videopress/.w.org-assets/screenshot-1.png and b/projects/plugins/videopress/.w.org-assets/screenshot-1.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/screenshot-2.png b/projects/plugins/videopress/.w.org-assets/screenshot-2.png
index 56c3f2e090758..0b54c4d546bab 100644
Binary files a/projects/plugins/videopress/.w.org-assets/screenshot-2.png and b/projects/plugins/videopress/.w.org-assets/screenshot-2.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/screenshot-3.png b/projects/plugins/videopress/.w.org-assets/screenshot-3.png
index 02525710fd8f4..87732a17e5589 100644
Binary files a/projects/plugins/videopress/.w.org-assets/screenshot-3.png and b/projects/plugins/videopress/.w.org-assets/screenshot-3.png differ
diff --git a/projects/plugins/videopress/.w.org-assets/screenshot-4.png b/projects/plugins/videopress/.w.org-assets/screenshot-4.png
index cff1d64420b8d..9f8bc71fbfc81 100644
Binary files a/projects/plugins/videopress/.w.org-assets/screenshot-4.png and b/projects/plugins/videopress/.w.org-assets/screenshot-4.png differ
diff --git a/projects/plugins/videopress/changelog/add-filter-for-filtered-order-data b/projects/plugins/videopress/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/videopress/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/videopress/changelog/try-lossless-image-optmization-part-3
new file mode 100644
index 0000000000000..cf77a8b55bb43
--- /dev/null
+++ b/projects/plugins/videopress/changelog/try-lossless-image-optmization-part-3
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/videopress/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/videopress/changelog/update-my-jetpack-protect-card-waf-dependency
new file mode 100644
index 0000000000000..59c80f69574e5
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-my-jetpack-protect-card-waf-dependency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update composer lock file
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock
index 8ce280a149990..2828923ed7187 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -1016,7 +1016,7 @@
"dist": {
"type": "path",
"url": "../../packages/my-jetpack",
- "reference": "2c06449483ed175f949e69ba407e6e92363c3b84"
+ "reference": "661b9575e9a137bbfa69319abe670453181a1449"
},
"require": {
"automattic/jetpack-admin-ui": "@dev",
@@ -1033,7 +1033,6 @@
"automattic/jetpack-redirect": "@dev",
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
- "automattic/jetpack-waf": "@dev",
"php": ">=7.0"
},
"require-dev": {
@@ -1597,7 +1596,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1630,7 +1629,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
@@ -1745,128 +1744,6 @@
"transport-options": {
"relative": true
}
- },
- {
- "name": "automattic/jetpack-waf",
- "version": "dev-trunk",
- "dist": {
- "type": "path",
- "url": "../../packages/waf",
- "reference": "6e2fd903a4dc024db95b51904989506f65013e0e"
- },
- "require": {
- "automattic/jetpack-connection": "@dev",
- "automattic/jetpack-constants": "@dev",
- "automattic/jetpack-ip": "@dev",
- "automattic/jetpack-status": "@dev",
- "php": ">=7.0",
- "wikimedia/aho-corasick": "^1.0"
- },
- "require-dev": {
- "automattic/jetpack-changelogger": "@dev",
- "automattic/wordbless": "@dev",
- "yoast/phpunit-polyfills": "1.1.0"
- },
- "suggest": {
- "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
- },
- "type": "jetpack-library",
- "extra": {
- "autotagger": true,
- "mirror-repo": "Automattic/jetpack-waf",
- "textdomain": "jetpack-waf",
- "changelogger": {
- "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
- },
- "branch-alias": {
- "dev-trunk": "0.18.x-dev"
- }
- },
- "autoload": {
- "files": [
- "cli.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "scripts": {
- "phpunit": [
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
- "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
- ],
- "post-install-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "post-update-cmd": [
- "WorDBless\\Composer\\InstallDropin::copy"
- ],
- "test-coverage-html": [
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
- "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
- ],
- "test-php": [
- "@composer phpunit"
- ]
- },
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "Tools to assist with the Jetpack Web Application Firewall",
- "transport-options": {
- "relative": true
- }
- },
- {
- "name": "wikimedia/aho-corasick",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/AhoCorasick.git",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/wikimedia/AhoCorasick/zipball/2f3a1bd765913637a66eade658d11d82f0e551be",
- "reference": "2f3a1bd765913637a66eade658d11d82f0e551be",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": "1.0.0",
- "mediawiki/mediawiki-codesniffer": "18.0.0",
- "mediawiki/minus-x": "0.3.1",
- "phpunit/phpunit": "4.8.36 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "ori@wikimedia.org"
- }
- ],
- "description": "An implementation of the Aho-Corasick string matching algorithm.",
- "homepage": "https://gerrit.wikimedia.org/g/AhoCorasick",
- "keywords": [
- "ahocorasick",
- "matcher"
- ],
- "support": {
- "source": "https://github.com/wikimedia/AhoCorasick/tree/v1.0.1"
- },
- "time": "2018-05-01T18:13:32+00:00"
}
],
"packages-dev": [
diff --git a/projects/plugins/wpcomsh/changelog/add-filter-for-filtered-order-data b/projects/plugins/wpcomsh/changelog/add-filter-for-filtered-order-data
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/add-filter-for-filtered-order-data
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/wpcomsh/changelog/atomic-default-profile b/projects/plugins/wpcomsh/changelog/atomic-default-profile
new file mode 100644
index 0000000000000..2f3bb177a6fb1
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/atomic-default-profile
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Site Level User Profile: expose all relevant fields on profile.php
diff --git a/projects/plugins/wpcomsh/changelog/atomic-default-profile#2 b/projects/plugins/wpcomsh/changelog/atomic-default-profile#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/atomic-default-profile#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/wpcomsh/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/wpcomsh/changelog/try-lossless-image-optmization-part-3
new file mode 100644
index 0000000000000..cf77a8b55bb43
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/try-lossless-image-optmization-part-3
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json
index 29b4419008739..3c952e5920f60 100644
--- a/projects/plugins/wpcomsh/composer.json
+++ b/projects/plugins/wpcomsh/composer.json
@@ -128,7 +128,7 @@
"composer/installers": true,
"roots/wordpress-core-installer": true
},
- "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_4_1_alpha"
+ "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_5_0_alpha"
},
"extra": {
"mirror-repo": "Automattic/wpcom-site-helper",
diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock
index 1f2498e56c198..79de7949878d2 100644
--- a/projects/plugins/wpcomsh/composer.lock
+++ b/projects/plugins/wpcomsh/composer.lock
@@ -1063,7 +1063,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "9f21b1d7607b21df7becfcdb49002d310d891440"
+ "reference": "39a207e6ee97aa176b4198439f5b7e8bc911ef87"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1091,7 +1091,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.6.x-dev"
+ "dev-trunk": "0.7.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
@@ -1705,7 +1705,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "1647bd686ed11800513f14aa1c93956e16a3b7f5"
+ "reference": "5d71e613ed54856799d620de9336ba8dfe795382"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1738,7 +1738,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "3.6.x-dev"
+ "dev-trunk": "3.7.x-dev"
},
"dependencies": {
"test-only": [
diff --git a/projects/plugins/wpcomsh/custom-colors/images/colors-screenshot.png b/projects/plugins/wpcomsh/custom-colors/images/colors-screenshot.png
index 1b9cd67f52bf4..f95b1a74331a5 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/colors-screenshot.png and b/projects/plugins/wpcomsh/custom-colors/images/colors-screenshot.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/pattern-default.png b/projects/plugins/wpcomsh/custom-colors/images/pattern-default.png
index ba2c7cd979aee..fb0c406a98c17 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/pattern-default.png and b/projects/plugins/wpcomsh/custom-colors/images/pattern-default.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/selected.png b/projects/plugins/wpcomsh/custom-colors/images/selected.png
index e80cb3890f9bb..f7da30f2387b5 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/selected.png and b/projects/plugins/wpcomsh/custom-colors/images/selected.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/tile-horizontally.png b/projects/plugins/wpcomsh/custom-colors/images/tile-horizontally.png
index 3da469d92b015..8b068186d5de8 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/tile-horizontally.png and b/projects/plugins/wpcomsh/custom-colors/images/tile-horizontally.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/tile-none.png b/projects/plugins/wpcomsh/custom-colors/images/tile-none.png
index dd9765e9c0e7c..5e244797364a2 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/tile-none.png and b/projects/plugins/wpcomsh/custom-colors/images/tile-none.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/tile-vertically.png b/projects/plugins/wpcomsh/custom-colors/images/tile-vertically.png
index f81c5be618ef6..d75f8626c327e 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/tile-vertically.png and b/projects/plugins/wpcomsh/custom-colors/images/tile-vertically.png differ
diff --git a/projects/plugins/wpcomsh/custom-colors/images/unavailable.png b/projects/plugins/wpcomsh/custom-colors/images/unavailable.png
index 7f337485a0340..e432dda60af19 100644
Binary files a/projects/plugins/wpcomsh/custom-colors/images/unavailable.png and b/projects/plugins/wpcomsh/custom-colors/images/unavailable.png differ
diff --git a/projects/plugins/wpcomsh/feature-plugins/masterbar.php b/projects/plugins/wpcomsh/feature-plugins/masterbar.php
index cb6d739e42a6f..316a57600ba3e 100644
--- a/projects/plugins/wpcomsh/feature-plugins/masterbar.php
+++ b/projects/plugins/wpcomsh/feature-plugins/masterbar.php
@@ -108,7 +108,7 @@ function wpcomsh_admin_color_scheme_picker_disabled() {
**/
function wpcomsh_hide_color_schemes() {
// Do nothing if the admin interface is wp-admin.
- if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
+ if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' || ! empty( get_option( 'wpcom_site_level_user_profile' ) ) ) {
return false;
}
@@ -333,7 +333,7 @@ function wpcomsh_get_wpcom_admin_interface_option() {
* from wp-admin going forward.
*/
function wpcomsh_unsync_color_schemes_on_save() {
- if ( get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
+ if ( get_option( 'wpcom_admin_interface' ) !== 'wp-admin' && empty( get_option( 'wpcom_site_level_user_profile' ) ) ) {
return;
}
diff --git a/projects/plugins/wpcomsh/frontend-notices/gifting-banner/images/gridicons-help-outline.svg b/projects/plugins/wpcomsh/frontend-notices/gifting-banner/images/gridicons-help-outline.svg
index 5a7cc556d195d..4fd6794223ccb 100644
--- a/projects/plugins/wpcomsh/frontend-notices/gifting-banner/images/gridicons-help-outline.svg
+++ b/projects/plugins/wpcomsh/frontend-notices/gifting-banner/images/gridicons-help-outline.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json
index 6dc4c6fd56ea2..193d5be54c834 100644
--- a/projects/plugins/wpcomsh/package.json
+++ b/projects/plugins/wpcomsh/package.json
@@ -3,7 +3,7 @@
"name": "@automattic/jetpack-wpcomsh",
"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
"homepage": "https://jetpack.com",
- "version": "5.4.1-alpha",
+ "version": "5.5.0-alpha",
"bugs": {
"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
},
diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php
index 032216a833ad1..8f864f446e661 100644
--- a/projects/plugins/wpcomsh/wpcomsh.php
+++ b/projects/plugins/wpcomsh/wpcomsh.php
@@ -2,14 +2,14 @@
/**
* Plugin Name: WordPress.com Site Helper
* Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 5.4.1-alpha
+ * Version: 5.5.0-alpha
* Author: Automattic
* Author URI: http://automattic.com/
*
* @package wpcomsh
*/
-define( 'WPCOMSH_VERSION', '5.4.1-alpha' );
+define( 'WPCOMSH_VERSION', '5.5.0-alpha' );
// If true, Typekit fonts will be available in addition to Google fonts
add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );