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 24cdd50 commit f22bdbd
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 97 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 @@ -50,7 +50,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
64 changes: 32 additions & 32 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": "910ca409f24b3fe8d09a99a138e0e4bd7c675151"
"reference": "4300e769efd5d041a7d38c12e3569f838bd84327"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "11bf18174a9d66c2d6e21e7961f5a76b00348017"
"reference": "d6cecc8d4cf46857b0ae505fbceada4aea738400"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "f3132016108bcbabaabc49598b44062e42a51a7d"
"reference": "2dcfd98c9f8ebfa4feba45f3969a6c84da6ec2c7"
},
"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": "2220e2aeb705c69481dabf2874c22a5863d3fc8b"
"reference": "6a32091610d7afc6a80c53d2df946b0f63dbf594"
},
"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": "bd0cf29bda0554db3a70aba93f450cf1c37e8e52"
"reference": "d692bb6e84ebadd69257f8eb01a10d4b3b45b552"
},
"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": "dba1a2201ceeabbe073ad61e19f9957e0f84f332"
"reference": "f41ef6321fafe750efceef50a3a74ec1bc1adc91"
},
"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": "be80bc7697159903d38817f94770ee858936ec12"
"reference": "8246df02c9e4f6a45fe3bc7d13b54b8b66f3ff14"
},
"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": "c86ca6c7751d44457c2d2c8e4e268c81f945c73e"
"reference": "0b0fa5beb77a4ee438401fe09f54782ea744ea7f"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "9d425a816cbf223d363fd91d5e379b1aba574d98"
"reference": "df8f62b8b2d63a8991b2d339489bdabd8d2100f6"
},
"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": "0fb8c90146b661ab5b4d3320fd712a3741995f09"
"reference": "d2e5b8b61866f4c3a8a29c2e1c8a2f1f5100de15"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "68319f57b6a3e91b4ffe1a10b6282cb068b3d516"
"reference": "50949d90d79b9bb9182bbe2c2105f13165092be7"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "83152ba5112d39bdd7af9857e9cb1f2788e653ec"
"reference": "eaef7773c15e7622760af4980253f6491ac20b23"
},
"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-image-cdn",
"reference": "53178d75b010e09a1f65b5420d220241634137dd"
"reference": "307f5e9411e7f69767f012e2bd7425af56882725"
},
"require": {
"automattic/jetpack-assets": "^4.0.2-alpha",
Expand Down Expand Up @@ -915,7 +915,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "6604a03d1d279d2cc34128d2256016409f66c924"
"reference": "84b9bf385db2b904be3cca178ac268313fdc2f9a"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -976,7 +976,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "55f10a451bbd465d89cb9a0df4e6326e65c0ff6c"
"reference": "0ec3d9013a4b2a5f27750a8470e9c5a50fced373"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1054,7 +1054,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "ddb5b6379fbf61db47e233444267c741ff333679"
"reference": "4696845c88b0fefe940f8585a027817aa74cfd31"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1119,7 +1119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "1614e6d72cdc59085752c030966a394c310e245e"
"reference": "76671724f033b7b30ae463b5d4afac1b1bbe4b12"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1170,12 +1170,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": "63b14c2029ceccb3bc9c3fc04a52da316c00a607"
"reference": "97935cad9baecc9fb5efc5fd30257a9a046b5591"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand Down Expand Up @@ -1280,7 +1280,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "5baf664db849e8d917b9d2ac873dd19a4243050f"
"reference": "76af64c339f4707516caa310994bd92d9b9f814d"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1344,7 +1344,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "e482c938c31b177412bb95fc978287c20c6490cd"
"reference": "ef8346577ed859cc58c606378f33cbdaf15c1c38"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1415,7 +1415,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugin-deactivation",
"reference": "e28e5026377213be7437ceb885b5d810625fd2be"
"reference": "ec7ff4a1892f1266e50643e4974c97240cf36683"
},
"require": {
"automattic/jetpack-assets": "^4.0.2-alpha",
Expand Down Expand Up @@ -1486,7 +1486,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "1a639f03d67d6110fe59cce77f8a1b94213e77ab"
"reference": "93c311853f6e06a886bed2fa30e59992b03501d2"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1545,7 +1545,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "5db719530dccdc23d97d829c317b8b8b5720ebe0"
"reference": "0152ba5c53bbf423def58947f01c52bad99ea488"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1618,7 +1618,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "f4ccf65273c3ee8362ba8ed6fd495f04ad7a4de1"
"reference": "4119b79cf88a0f3035800c1cb0e44f42cea45c38"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1696,7 +1696,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "8bd7dcdc0f553db111891687ba8b8a8831d964cc"
"reference": "9bda1e271d4d6230ee8661cc222fd36b7f3131d1"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1754,7 +1754,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "94110c2955d371df9af45670c508f9c9b565fa37"
"reference": "b9c513eb2e2794754806214778a20ce2e5ea25c9"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1811,7 +1811,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-schema",
"reference": "0f23b86030d5f0d7fefeab9e487f85684badac2c"
"reference": "656edb69610e8e9f22d80ca84677e8f466109c78"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1884,7 +1884,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "15fa86ccdeeecc88e34e93ecb62a548af573cfbb"
"reference": "89e98b9cc6b68eb6da1228877b38de9587d975b1"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1951,7 +1951,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "cf826c503c874b3b1fc64e51b94f4dac4d5ee129"
"reference": "c18f3fb3b6ca3061aade9da25d1a7a67c29ab792"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -2032,7 +2032,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-wp-js-data-sync",
"reference": "d232b094862c59e80420571294ebd5228a46f5b9"
"reference": "1594c61e3d82fdde1a71c4799c7f5c70a064fda6"
},
"require": {
"automattic/jetpack-schema": "^0.2.0",
Expand Down
Loading

0 comments on commit f22bdbd

Please sign in to comment.