Skip to content

Commit

Permalink
Settings: Newsletter: Adding connection banner to each section (#39539)
Browse files Browse the repository at this point in the history
* Settings: Adding connection banner for all Newsletter options

* changelog

* Settings: Updating icon for the Newsletter connection banner

* Settings: Updating icon for the Newsletter connection banner

* Settings: Renaming const and its value

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11136113747

Upstream-Ref: Automattic/jetpack@68099d6
  • Loading branch information
grzegorz-cp authored and matticbot committed Oct 2, 2024
1 parent 9370163 commit 85ee9ab
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 95 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-autoloader": "^3.1.0",
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-my-jetpack": "^4.35.9",
"automattic/jetpack-my-jetpack": "^4.35.10-alpha",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-backup": "^3.4.12",
"automattic/jetpack-status": "^4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-backup/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-my-jetpack": "^4.35.9",
"automattic/jetpack-my-jetpack": "^4.35.10-alpha",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-status": "^4.0.2"
},
Expand Down
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.35.10-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [4.35.9] - 2024-09-30
### Changed
- Fix parameters to allow for connectAfterCheckout flow from recommendation card [#39578]
Expand Down Expand Up @@ -1755,6 +1759,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[4.35.10-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.9...4.35.10-alpha
[4.35.9]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.8...4.35.9
[4.35.8]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.7...4.35.8
[4.35.7]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.6...4.35.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '4.35.9';
const PACKAGE_VERSION = '4.35.10-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.35.9',
'ver' => '4.35.10-alpha1727831716',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
62 changes: 31 additions & 31 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "64bc74c007123fce995069dca84a550b2de06fb6"
"reference": "ce43f2068a70da7667d45855f64726ca675c2d74"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "96bb2fc1bef6d77cda01d9ff460ba58e8c338602"
"reference": "cf625617b7d52bdf987631043d239c56685c1b88"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "511e69e23a9e953f67089ab9b915488d42230642"
"reference": "1270aa4bb3e7e947b6572871e67de45bd59a606b"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -194,7 +194,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "420b05cd1a15ec1ab0e43db76300be0b5390f683"
"reference": "d528aba5934a36263702765b889d7323fbff17bc"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -261,7 +261,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-backup",
"reference": "2dcb94c09a800ffa75bea950626fedcef46478c2"
"reference": "bfcb0de07f946bd0858060a0410926657d05444b"
},
"require": {
"automattic/jetpack-admin-ui": "^0.4.5",
Expand All @@ -271,7 +271,7 @@
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-my-jetpack": "^4.35.9",
"automattic/jetpack-my-jetpack": "^4.35.10-alpha",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.13.2",
"php": ">=7.0"
Expand Down Expand Up @@ -351,7 +351,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
"reference": "33a45aeaa23977e7b1f80866dc3842cdc8308c69"
"reference": "79bf9dda848872d894728ff6dc2521b43c1b2c02"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -411,7 +411,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "59308077b673730ade52099b8fcd622556728029"
"reference": "71cb7383a8b057778c98137fef0b7bff701dffa4"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down Expand Up @@ -479,7 +479,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "d97ed528ab9fd3fd459bf1d75b21d92435bbd90a"
"reference": "2aef059ee08680edb4f7706eb2938779b81af607"
},
"require": {
"automattic/jetpack-boost-core": "^0.2.12",
Expand Down Expand Up @@ -555,7 +555,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "5b4d82efaeec82f040cb0f140bab661c8fc2e07d"
"reference": "b8f056abb9f230f9a8f652189e1fc9db8dc1637c"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -615,7 +615,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "fc6e4a583c91fcb46fd232381a9e62275bc7cc76"
"reference": "eb28fc4c7babdf2c053f00f9af43e8250b9a1725"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -690,7 +690,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "b95b26aa5bfc24f6d984d7232e3d68a9a126010b"
"reference": "a8170a6cad627c2ea0a2c4f11a8519482dc14c13"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
Expand Down Expand Up @@ -780,7 +780,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "ecb6994ec76f2907628fd0a2382a262c1ef2ac95"
"reference": "b4af0809e617b33ffd8d0a91bf2249909fed89f5"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -834,7 +834,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "4eb2188792caaa0172603f8d62f06afca5760c93"
"reference": "12148715cf4b149e2171b71114783fb466080626"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -887,7 +887,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "f1db066f6215b4fd95de4e9ee2960c04deb131c4"
"reference": "2afad76efa9a4be585c254d584625e13d791f44c"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down Expand Up @@ -962,7 +962,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "bcb2ce81679f2343982108b7dac97ae9e22e6ce0"
"reference": "17933070b07ba73bc2b8c1436369f8fd1ecc78f7"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1020,7 +1020,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "3705b1983e11bb0bd789faeda046f15c5c752ed9"
"reference": "30491de3550b4fc81803f4c1b81dc0f7d0a233a3"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
Expand Down Expand Up @@ -1095,7 +1095,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "7fbfec0029cc0823dbafc43154c6b17737fb31d7"
"reference": "94822e55afa8470ec9ea5d87a6cac5c027203084"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down Expand Up @@ -1157,7 +1157,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "a2dc8a386967d1a9ca861bd3277f9ea064da86cc"
"reference": "b73afd6deb4884ac48f799dc8dd88140e1e26198"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1205,12 +1205,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "4.35.9",
"version_normalized": "4.35.9.0",
"version": "4.35.10-alpha.1727831716",
"version_normalized": "4.35.10.0-alpha1727831716",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "fc0678f9354ce153454098fa42ca4399e63096cf"
"reference": "ec898a868fd546e23a6e55369fff7062f1d95815"
},
"require": {
"automattic/jetpack-admin-ui": "^0.4.5",
Expand Down Expand Up @@ -1312,7 +1312,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "57d43dfceeb4c50556b07c115653ce0f0fa201b5"
"reference": "d316f227857ad3f8ef2d78b1008f468892fcaf37"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1373,7 +1373,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "0aff55ea84e086085d0aed3fee1799885f622ba8"
"reference": "0b3ca5ff275d2dcc83c2f8e7ba44e876bca1a514"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down Expand Up @@ -1441,7 +1441,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "2f0af841bdf35c75a9a21aba7724ea6f52a32eff"
"reference": "bcc07681d695b8bf05a04527e9ebc65b27c4c05f"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
Expand Down Expand Up @@ -1497,7 +1497,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "50c5e2ae5576755e946e23a92d823d7dcb2fab99"
"reference": "8dc0309850225b10464ed8fd3aff329d5c3e1772"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1567,7 +1567,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "73c20d1e6b03952f9bd97a5d8469e62caef91dbf"
"reference": "52b382b81ee2f7a3bf4fcae38bf03ce4d362a1b5"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down Expand Up @@ -1642,7 +1642,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "2d01270b141fc5d2e7d016d9c7ee843c5a6170f6"
"reference": "e81e9da0f86351b7d6d458bdc55ecc2d9011a224"
},
"require": {
"automattic/jetpack-status": "^4.0.2",
Expand Down Expand Up @@ -1697,7 +1697,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "243edd64446ec610ff051e4b3ca714766dbc689b"
"reference": "e3bb0a7308e45ad67da1958920b220661fe9d3f5"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1751,7 +1751,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "ceb33aeed09e00aad633e0117fd348dff23d7175"
"reference": "f29ddc7dc55afaf199c1e9bed976ab1eafbc220f"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -1815,7 +1815,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "69e329a04ea160b67497143bd561b82a68255941"
"reference": "edaef0261d86392acbc8dc16cc1e51f9ac98c13e"
},
"require": {
"automattic/jetpack-connection": "^5.1.1",
Expand Down
Loading

0 comments on commit 85ee9ab

Please sign in to comment.