Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge 17.3 final into trunk #16509

Merged
merged 266 commits into from
May 17, 2021
Merged

Merge 17.3 final into trunk #16509

merged 266 commits into from
May 17, 2021

Conversation

jkmassel
Copy link
Contributor

Merges all changes from the 17.3 series into trunk.

Momo Ozawa and others added 30 commits April 14, 2021 16:48
Threat Details: Open Jetpack settings in a web vc
2f4c0e3
Add jetpack settings URL to App Constants
16458a0
Update copy for missing credentials
51e657f
@aerych
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-iOS i…
c27db8b 
…nto feature/16183-unreplied-comments-filter
@ScoutHarris
Add events for User Profile Sheet actions.
1992f75
@ScoutHarris
Track user profile shown.
2266499
@ScoutHarris
Add source to indicate where the view was shown from.
8653e1c
@ScoutHarris
Track when site is shown from the user profile sheet.
4a310da
@ScoutHarris
Remove unnecessary type.
e80ffd6
@twstokes
Detect local author ID changes to an AbstractPost.
eb6f95e
@twstokes
Set the author ID and author for new Posts and Pages so that they'll …
8a6ae61 
…be available in the settings UI.
@twstokes
Set the author ID for RemotePosts so the API request will include it.
aeb7d0a
@twstokes
Add tests for local author changes.
3755fc8
@twstokes
Query for the author on Page and Post creation, due to self-hosted si…
43b3c48 
…tes.
@twstokes
Point to accompanying WPKit updates.
17406b8
Add jetpack settings webview controller extension method
59b661e 
Delete jetpack settings URL from App Constants
Reduce use of hasValidCredentials
062614b
Move view logic from coordinator to VC
699aa24
@guarani
Merge branch 'develop' into gutenberg/integrate_release_X.XX.X_enable…
a07b421 
…_UI_tests
@leandroalonso
Add: Jetpack 'jpios' tracks prefix
82dce28
@bjtitus
Fix #16248: Move shceduling dismiss to didDisappear
a6b26d9
@jkmassel
Include strings updates
65ac45b
@leandroalonso
Remove stories first AB testing
4e0823c
@twstokes
Revert "Point to accompanying WPKit updates."
4f50606 
This reverts commit 17406b8.
@twstokes
Merge remote-tracking branch 'upstream/develop' into feature/set-and-…
03bb142 
…change-author
@ScoutHarris
Rename events to be more specific.
e420dcf
@ScoutHarris
Merge pull request #16327 from wordpress-mobile/feature/15662-like_no…
a0236c5 
…tif_tracks

User Profile: track events
@twstokes
Point to WordPressKit beta.
dc6f788
Fix comment for missing server credentials
b1627a6
Display notice if siteID is invalid
dc30661
dcalhoun and others added 17 commits May 7, 2021 13:30
@dcalhoun
Revert erroneous change to cocoapod version
dd9130a 
This likely occurred from running `pod install` rather than `bundle exec
pod install`.
@dcalhoun
Update gutenberg ref
22875b7
@ceyhun
Fix audio file upload issues for audio block and from media library
c139f82
@dcalhoun
Update gutenberg ref to v1.52.1 tag
755fd47
@dcalhoun
Merge pull request #16448 from wordpress-mobile/gutenberg/integrate_r…
83f673f 
…elease_1.52.1

Integrate gutenberg-mobile release 1.52.1
@ceyhun
Merge pull request #16450 from wordpress-mobile/gutenberg/fix-audio-u…
4b0c40d 
…pload

Fix audio file upload issues for audio block and from media library
@jd-alexander
Updated gutenberg ref.
169f5be
@jd-alexander
Updated gutenberg mobile ref.
abf25ee
@jd-alexander
Updated gutenberg-mobile ref.
11dfafa
@jd-alexander
Updated release notes.
7314a3c
@jd-alexander
Made release notes entry a bit clearer.
40bca4b
@jd-alexander
Merge pull request #16487 from wordpress-mobile/gutenberg/integrate_1…
2f6df07 
….52.2

Integrate gutenberg-mobile release 1.52.2
@jkmassel
Update metadata translations
2914211
@jkmassel
Bump version number
8773cc7
@jkmassel
Update release dependencies
6f9ed66
@jkmassel
Update translations
c6be4b7
@jkmassel
Bump version number
e668960
@jkmassel jkmassel added this to the 17.4 milestone May 17, 2021
@jkmassel jkmassel requested a review from a team May 17, 2021 04:43
@jkmassel jkmassel self-assigned this May 17, 2021
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 17, 2021 •
edited
Loading

You can trigger an installable build for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 17, 2021 •
edited
Loading

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

loremattei
loremattei approved these changes May 17, 2021
View reviewed changes
Copy link
Contributor

@loremattei loremattei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jkmassel jkmassel marked this pull request as ready for review May 17, 2021 17:56
@peril-wordpress-mobile
Copy link

Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@jkmassel jkmassel enabled auto-merge May 17, 2021 17:57
@jkmassel jkmassel merged commit 05c2e8a into trunk May 17, 2021
@jkmassel jkmassel deleted the merge/17.3-final-into-trunk branch May 17, 2021 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loremattei loremattei loremattei approved these changes

Assignees

@jkmassel jkmassel

Labels
Releases
Projects
None yet
Milestone
17.4
Development

Successfully merging this pull request may close these issues.