Skip to content

Commit

Permalink
Settings - Newsletter, Sharing: Disabling options for sites missing u…
Browse files Browse the repository at this point in the history
…ser connection (#39520)

* Newsletters: Disabling controls that need user connection

* changelog

* Settings: Fixing disabled label when not saving

* Settings: Improving isLinked check

* Settings: Removing disabled CSS from active controls

* Settings: Disabling sharing without a connected user

* Settings: Disabling newsletter settings for sites without a single connected user

* Settings: Disabling also whole groups

* Settings: Updating the description of the task

* Settings: Updating the description of the task

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

Upstream-Ref: Automattic/jetpack@6b41b2a
  • Loading branch information
grzegorz-cp authored and matticbot committed Oct 7, 2024
1 parent 8e51077 commit 5ccd571
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 91 deletions.
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.11-alpha1727884694',
'ver' => '4.35.11-alpha1728259003',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
60 changes: 30 additions & 30 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": "1716a01fc55b7cc5f0510be45c46f83979bdc512"
"reference": "4e8b5740d2e82d3b0a908b5c29d1096da95741ec"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "b2405b9846b6749cf266f38352972b2222251dbd"
"reference": "516876147eeef4387117ff569b38285166bb2dfe"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "bb5ba892af30f7fc3c29559a49c12481d2036e12"
"reference": "1fcc39df6a89a4740e15a999a94358cdafc00bbf"
},
"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": "05f0fac0fa0995a8031fa3f4c4766cfbaab3db87"
"reference": "6545e4545a95a43e24d206a092b147cbb10d6519"
},
"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": "c0013a2d716fc085f046fc568957e3849988bd52"
"reference": "c14dbadd0ec5294d76eeb11f43d5ca1036b27c2d"
},
"require": {
"automattic/jetpack-admin-ui": "^0.4.5",
Expand Down Expand Up @@ -351,7 +351,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
"reference": "61c5fc657621a6a7fae65c76f04752399a3f0c80"
"reference": "db72be53f7aebd8be4732e4ab97b6575c3294e37"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -411,7 +411,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "e024b909051cdf6c720815027bd51e8656a9ea97"
"reference": "ccaf3bbf60e9409a2183846f5226b92efb969417"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down Expand Up @@ -479,7 +479,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "d011d87aa3569ce022cac2eb758395eae9980a8c"
"reference": "a8c7e60c7a2cc676e4b17aed2f79f85b182a2e3a"
},
"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": "8351543606ab1e561b769b4a6da013d42f6a2b84"
"reference": "3dd6be14bb0083e5922c6497f23992c041025bf0"
},
"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": "f98639ee53ac9d16c41adde2e2e61ae4a651201c"
"reference": "02e93965551f17fcf0d92d585a747e86fccdaf9f"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -690,7 +690,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "c2c2a2a2bc31fe963e1020d55803ebbcfc6ef866"
"reference": "966c226d7358af35d586f44e41e4063e6f6f4e4a"
},
"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": "cdcb2a56c9d88d664d63674423ccb7be9bc8983e"
"reference": "eab506e3f678fe7c00e1a7e3cf0796a8b05aabef"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -834,7 +834,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "da6f0967ac9c24bf5f2eb4afcd02d72c35d7fef1"
"reference": "0781bf13bb4eaa65334d210dcf8696f231570a41"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -887,7 +887,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "517162ed2cebca5a7fc09d96ebb919df8191df97"
"reference": "ae2064b08c86d3ca90293aaa007c5ba7ae6e988a"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down Expand Up @@ -962,7 +962,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "08fec7b260c2c683bfe2f97f7fb8079c0eb85a52"
"reference": "3802bb08e121d33b9e597754e163a4a78e45485c"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1020,7 +1020,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "ee7bb39bca179051882796ebcc7d45848f930eee"
"reference": "855e9822e92a0232af1d0085a6ec675633572167"
},
"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": "f8a81d37fdd7a1606e9e39f49171d34fe3728252"
"reference": "783446017d80290b67e367c31affe45bf1cb83fb"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down Expand Up @@ -1157,7 +1157,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "c393364055987523d7d67f3ce03aea916c552a6d"
"reference": "6247e3bf8ba8f9fe189726e590c82f96b348442b"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1205,12 +1205,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "4.35.11-alpha.1727884694",
"version_normalized": "4.35.11.0-alpha1727884694",
"version": "4.35.11-alpha.1728259003",
"version_normalized": "4.35.11.0-alpha1728259003",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "c965c49c5fa1825f0c0b1372488626edd7ea2119"
"reference": "b2fa53c2bc247c8f36d7dcc3ec0194e956559673"
},
"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": "b4cb658566c85a9aecd1eb6166790a91f0242e08"
"reference": "bbcf7d54bfb8efdae53fe4dfdba92248fdf6f77a"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1373,7 +1373,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "b2a8ba3710b19263c9f69ef7bc8cddad5867edad"
"reference": "a62e4dd83ca87f2a74177492f58b771dc2752991"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down Expand Up @@ -1441,7 +1441,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "4dc7110b923e0f761e01d6ef440616a87471eda4"
"reference": "15fdcab7f8a708a27f25fd2d9613c6e54b5bc624"
},
"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": "28cfb871b68564006fb6ea583e54703819260705"
"reference": "f33e7e743a2172fcb1cd8723185403ec41325721"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1567,7 +1567,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "3eccc2c80e4f739253c39f733c2779608b824a33"
"reference": "11df232fb0629f99d0ddb4713287a8e6a3b70e80"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down Expand Up @@ -1642,7 +1642,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "ad7a4d85840c9342bf1e6ce879a2945ba9bb8044"
"reference": "1d9f66501806ff2976d83436abbb05d933dc3877"
},
"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": "504b879535da54bf8868e7ca9646d79f3b76b2dd"
"reference": "de7ddb278b564059baf2066e80809a4197793016"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1751,7 +1751,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "ec3fd234e3d181ad324df03f43d82d40e64f264b"
"reference": "da7f5e92ac8c7e1fbef918880434bd5981696fe5"
},
"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": "3f3b92e5372c261582568b6da7c74cacb75010d4"
"reference": "42ab0247c0b34eacf4af25e406542ca3fbf8a5d5"
},
"require": {
"automattic/jetpack-connection": "^5.1.2-alpha",
Expand Down
Loading

0 comments on commit 5ccd571

Please sign in to comment.