-
Notifications
You must be signed in to change notification settings - Fork 869
Admin UI: Add Upgrade Jetpack menu item for free users #47418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 46 commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
1cbc66a
Admin Menu: Reorder menu items so external links appear last
DevinWalker cd60b97
Remove unnecessary paragraph bottom padding
DevinWalker 9c736c8
Add devin's wp.org handle to readme
DevinWalker fad3e8f
Remove paragraph bottom padding causing vertical alignment issues
DevinWalker 36d5cea
add devin (dlocc) to contributors list
DevinWalker 0a1cc55
Backup: Replace Jetpack Button with WordPress Button component
DevinWalker 7259e4d
Admin Menu: Simplify menu item titles
DevinWalker d611f0e
Add missing changelog entries for admin header improvements
DevinWalker a21d087
Update projects/packages/backup/src/class-jetpack-backup.php
DevinWalker 649069d
Update projects/packages/my-jetpack/src/class-activitylog.php
DevinWalker 10b8090
Update BackupNowButton propTypes to include new variant options
DevinWalker 84fc4af
Update projects/plugins/jetpack/readme.txt
DevinWalker be32c94
Update projects/js-packages/components/components/admin-page/style.mo…
DevinWalker ebdfb8e
admin-ui: Add Upgrade to Pro menu item for free users
DevinWalker 3f16dcc
admin-ui: Update "Upgrade to Pro" menu item styles and tests
DevinWalker 657b5d6
admin-ui: Update upgrade menu redirect slug to use SaaS-managed URL
DevinWalker 23f24f7
Merge branch 'trunk' of github.com:Automattic/jetpack into feature/up…
DevinWalker eed8e20
Address code review feedback
DevinWalker f342bc0
Merge branch 'trunk' of github.com:Automattic/jetpack into feature/up…
DevinWalker d4b6491
Merge branch 'trunk' of github.com:Automattic/jetpack into feature/up…
DevinWalker 683eba1
Admin UI: Update menu item text to "Upgrade Jetpack"
DevinWalker 617ffd3
Admin UI: Clean up changelog entries for this PR
DevinWalker 4812910
Address code review feedback for upgrade menu feature
DevinWalker f5c0603
Merge branch 'trunk' of github.com:Automattic/jetpack into feature/up…
DevinWalker 1653308
Fix upgrade menu showing when site has active license
DevinWalker 34cf1f0
Fix upgrade menu detection by checking is_free field
DevinWalker fa2df07
Add comprehensive tests for upgrade menu plan detection
DevinWalker de846ec
Update composer.lock to include new Jetpack dependencies and update e…
DevinWalker 5b70ad8
Admin UI: Update docblock to reference "Upgrade Jetpack"
DevinWalker dbf2f01
Add changelog entries.
8e39460
Merge branch 'feature/upsell-to-pro-wp-admin-menu' of github.com:Auto…
DevinWalker 7395c74
Merge branch 'trunk' into feature/upsell-to-pro-wp-admin-menu
simison ec433d9
Update composer.lock
simison 0b07819
Satisfy Phan
simison bda9b52
Ran ./tools/composer-update-monorepo.sh
simison 25b78be
Remove circular dependency
simison 0cecf4d
Update composer locks after circular dependency fix
simison d40e4ba
Update also A4A client
simison 7aab45f
Changelogs
simison 345ad70
Update Admin_Menu_Test.php
simison 676964e
Add legacy active_plan['class'] check
simison 8f51d33
Use true null but still suppress Phan
simison c27bfbc
Update tests
simison c611366
See if separate process for each test helps
simison ce1b5dc
Run tests regularly, remove the static caching of $is_free
simison fa1702f
Remove deprecated setAccessible
simison f49f943
Run deprecated method on older PHP versions
simison File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
projects/js-packages/components/changelog/update-header-and-nav-cleanup-and-improvements
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Significance: patch | ||
| Type: changed | ||
| Comment: Part of admin header normalization work | ||
|
|
||
| Remove padding from admin page header subtitle for consistent spacing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,4 +59,3 @@ | |
| :global(.jetpack-admin-page #dolly) { | ||
| background-color: #fff; | ||
| } | ||
|
|
||
4 changes: 4 additions & 0 deletions
4
projects/packages/admin-ui/changelog/feature-upsell-to-pro-wp-admin-menu
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: minor | ||
| Type: added | ||
|
|
||
| Add "Upgrade Jetpack" menu item for free users in the Jetpack admin menu. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.