Skip to content

Commit

Permalink
Add/ai to complete feature copy (#40577)
Browse files Browse the repository at this point in the history
* Add AI to Complete feature copy

* changelog

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

Upstream-Ref: Automattic/jetpack@a217fd3
  • Loading branch information
CodeyGuyDylan authored and matticbot committed Dec 11, 2024
1 parent 837181e commit c0eb784
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 89 deletions.
3 changes: 3 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

### Added
- Add AI to Complete feature copy

### Changed
- Remove purchase related elements when Complete is on site

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public static function get_features() {
'Boost',
'Social',
'Search',
'AI Assistant',
_x( 'Stats (100K site views, upgradeable)', 'Complete Product Feature', 'jetpack-my-jetpack' ),
_x( 'CRM Entrepreneur', 'Complete Product Feature', 'jetpack-my-jetpack' ),
);
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 @@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.1.2-alpha1733939044',
'ver' => '5.1.2-alpha1733950054',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
56 changes: 28 additions & 28 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": "137e1e164596fd67491f85e004e1bbf0cdf27aeb"
"reference": "36f6022ab8173eac2b3896e374a58ee843ca64ad"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "2923c0a52a16be59659a8eb70cf3a1320ded7387"
"reference": "b407428ec11fca718c733f292cdae23c3c4de93c"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "e02f934c54b525a3b08b5906785e52721dd784c0"
"reference": "9758b99b02d8fc6765150828151a78c9b6c11a59"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "5ca271a31eb029ef852c6e23f53c47d1a08e872c"
"reference": "2987f0c83c9655cb6b23a67e2d90f6740619512f"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "e409d42dc653b26dd07eb8a95739dd9bbc9f1f3d"
"reference": "a41f5729760f6e050c44e2e8c7f2c181dd3d8247"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "b0e699baae84c6cbc590491f042c8a6677ac20db"
"reference": "1f0a59aba75c991e45728eb97fe77281d5e3118e"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.2",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "d5152363a7cdf136b4b001975ac0d818827d6a9e"
"reference": "5536caf4cf71b9f539ae2fcbb4a1c7cde2c51a99"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "95bbb45453c5f3f593bc17c9e5d42588eea22197"
"reference": "6ef98e14cffb0b7e8042dafe71941bbeee946703"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "5c5b8c6b212b79bf7c6b1322c7988b9d4a2a3690"
"reference": "ef1350fe50742c7926d30c4f8b32b796f8d4dafe"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -655,7 +655,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "dd3b1ffbd779d30c87339a653e1058c9630c88fe"
"reference": "53ff1d446075ffc15477849bf14965d066533571"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "7f22e8ba429e31af7ed958d057d63413801db19d"
"reference": "437eafe43dd46dd2faa11b74cbf6af670efb5851"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "0b025520af5b5f4a5a910bf52e22fda21c7b4587"
"reference": "268332647108be5a5c867ee3e788ae96284ec1c0"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "366100b3c49500680171baf80cb078b1233c415c"
"reference": "927a59bf25c92915592289352cad5c3162129080"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "c73e784d68d4c7a92f68cc1f41be622680cc0763"
"reference": "f3bba051c8f21e535688f723bd2d8a2aa8d72375"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -985,7 +985,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "43b8b1733284732ecf829e5dbbbf0e4f4bbf2a58"
"reference": "f528a76b7bfe4decf2f4a51465b1358e123c6179"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "a5aea36ca4e007c068e7647788f801ffa467fd9a"
"reference": "49f2bc228fbdcd6ac0fa4b915e17f33ae99e3ecb"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1101,12 +1101,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "5.1.2-alpha.1733939044",
"version_normalized": "5.1.2.0-alpha1733939044",
"version": "5.1.2-alpha.1733950054",
"version_normalized": "5.1.2.0-alpha1733950054",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "6252ecc1b32ff36be31ffb85e95f2f680d7a4caf"
"reference": "14318e4c276260cbbc3d974ef0e61e4b3d9c05ed"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand Down Expand Up @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "be080ce0bcb705150ca76d4b4127cbdbf1b55d69"
"reference": "c19bab54dc718bebc8b7c0a8f2fccc3fe3b7eaf8"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "48c763bc9702d5af61e7b90775229b42a0597a9f"
"reference": "e253ac93727be4ac96f66e1a2390eaa2235dc482"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "6455b9a9465161b08f8daf6d7da50b961ee921cd"
"reference": "64eb17b2fff01e567b8eeda34298c80127334510"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "49942422e4e1348d9c869f646418acc856503590"
"reference": "8cb60a5b8a0a8260564d87c3ea5966f03600b9aa"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1478,7 +1478,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "d18c1248df7d10542c14ea551a7b6f4ca04b76a8"
"reference": "fb320810fcc66492ed500ea273d791981143060e"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1556,7 +1556,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "9d128bc2d851ae28f83eb253a6e4280d3d584ef5"
"reference": "36092a1fa29b7d766eaae091e2e334b0b6d89591"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1614,7 +1614,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "c630365a2be535627c649fb5d8e607e40da2179a"
"reference": "e4889c9af7dbcf43e643ef13955ea5f6e3129f94"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "d16d426917678453ea1eeda259f9f6d7c1291ed8"
"reference": "2ff9236a6ea2acc949377b9e61a29d888dfd18b2"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1738,7 +1738,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "2658e4b69b65200d3cf3b63e7d6a2574c9d360b1"
"reference": "d4d25eb2ac813be941ac38d68bf7af04d7561af2"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down
Loading

0 comments on commit c0eb784

Please sign in to comment.