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 release 7.47-rc-2 to main #1351

Merged
merged 29 commits into from
Sep 7, 2023
Merged

Merge release 7.47-rc-2 to main #1351

merged 29 commits into from
Sep 7, 2023

Conversation

ashiagr
Copy link
Contributor

@ashiagr ashiagr commented Sep 6, 2023 •
edited
Loading

This brings #1342, #1344 to main.
#1350 is already present in main but the version code in 7.47-rc-2 is updated after its inclusion in 7.46.1 release.

mchowning and others added 28 commits August 21, 2023 10:13
@mchowning
Bump version number
e620d2a
@mchowning
Update draft release notes for 7.46.
d4f7210
@mchowning
Release Notes: add new section for next version (7.47)
5a76554
@mchowning
Avoid crash when accessing and dismissing episode details from up nex…
1bd53d0 
…t queue (#1300)
@mchowning
Bump version number
3567dae
@mchowning @ashiagr
Make sure that we're batching multiselect updates
4bd33e3
@mchowning @ashiagr
Update changelog
27e1e7c
@ashiagr
Update version code
fffd47e
@ashiagr
Bump version number
85eab18
@mchowning @ashiagr
Use transaction when archiving multiple episodes (#1327)
f5a948a 
Co-authored-by: ashiagr <[email protected]>
@ashiagr
Bump version number
ecfef17
@ashiagr @mchowning
Temporary fix for notification permission checker (#1325)
5d936d0 
Co-authored-by: Matt Chowning <[email protected]>
@mchowning
Remove previous toolbar action observers when adding a new one (#1333)
a9b3e76
@ashiagr
Bump version number
7ac3ba0
@ashiagr
Update translations
a627679
@ashiagr
Bump version number
20c4662
@ashiagr
Update draft release notes for 7.47.
a590f64
@ashiagr
Release Notes: add new section for next version (7.48)
448802b
@ashiagr
Update cloud storage limit title (#1342)
0f2c26c
@ashiagr
Bump version number
c317b69
@ashiagr
Update multi select toolbars setup (#1350)
feed2ec
@ashiagr
Merge branch 'release/7.46.1' into release/7.47
7db2f29
@ashiagr
Fix formatting
50269b2
@mchowning
Add Sentry breadcrumbs when toolbar actions change (#1344)
41ff982
@ashiagr
Merge branch 'release/7.47' of https://github.com/Automattic/pocket-c…
5865f3c 
…asts-android into release/7.47
@ashiagr
Bump version
e9d2665
@ashiagr
Bump version number
15aeb53
@ashiagr
Merge branch 'main' into merge/release-7.47-rc-2-to-main
4b31e52 
# Conflicts:
#	metadata/release_notes.txt
#	version.properties
@ashiagr ashiagr marked this pull request as ready for review September 6, 2023 11:51
@ashiagr ashiagr requested a review from a team as a code owner September 6, 2023 11:51
mchowning
mchowning approved these changes Sep 6, 2023
View reviewed changes
Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

I noticed that the changelog for 7.45.1 got removed during the merge, so I added it back in 9db22c3. With that change, this looks good to me, so I'll approve but hold off on merging so you can take a look @ashiagr .

@ashiagr ashiagr merged commit 84ddfc3 into main Sep 7, 2023
@ashiagr ashiagr deleted the merge/release-7.47-rc-2-to-main branch September 7, 2023 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mchowning mchowning mchowning approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ashiagr @mchowning