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.81 into trunk #2711

Merged
merged 21 commits into from
Jan 30, 2025
Merged

Merge release/7.81 into trunk #2711

merged 21 commits into from
Jan 30, 2025

Conversation

SergioEstevao
Copy link
Contributor

Merging release/7.81 into trunk.

Via intermediate branch merge/release-7.81-into-trunk, to help fix conflicts if any:

                            release/7.81  ----o-- - - -
                                               \
           merge/release-7.81-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@SergioEstevao
Add source parameter to dismiss event
0682f48
@SergioEstevao
Use correct percentage to show banner
153d106
@SergioEstevao
Add new event
ddb85cc
@SergioEstevao
Add button to allow navigate to settings from sleep timer
6d08a60
@SergioEstevao
Analytics audit: update free up space event (#2695)
7fa1112
@SergioEstevao
If we already have the episode info in the DB don't load it again
133ef0e
@SergioEstevao
Add change log entry for new settings options on UI
bf855cf
@SergioEstevao
Analytics audit: Add missing sleep timer settings (#2698)
db1e1ce
@SergioEstevao
Add option to remove specific episodes from listening history
b0b4b97
@SergioEstevao
Add missing events from listening history: confirmation of clear all …
ab76970 
…and dismissal
@SergioEstevao
Update event for removing from listening history
730dcdf
@SergioEstevao
Fix slow loading of bookmarks (#2699)
a61aa82
@SergioEstevao
Update changelog
d462b60
@SergioEstevao
Analytics audit: add remove from listening history events (#2702)
9a07979
@SergioEstevao
Add changelog entry for slow loading of bookmarks
80a840a
@SergioEstevao
Add missing changelog entry (#2710)
8821309
@SergioEstevao
Freeze strings for localization
d065ea7
@SergioEstevao
Update localization files with up-to-date values from GlotPress
2ae8908
@SergioEstevao
Bump version number
6e1cc19
@SergioEstevao SergioEstevao requested a review from a team as a code owner January 29, 2025 16:15
@SergioEstevao SergioEstevao requested review from danielebogo and removed request for a team January 29, 2025 16:15
@SergioEstevao SergioEstevao added this to the 7.82 milestone Jan 29, 2025
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@SergioEstevao
Merge branch 'trunk' into merge/release-7.81-into-trunk
e249c95 
# Conflicts:
#	podcasts/en.lproj/Localizable.strings
@SergioEstevao SergioEstevao merged commit 5e4186b into trunk Jan 30, 2025
4 of 6 checks passed
@SergioEstevao SergioEstevao deleted the merge/release-7.81-into-trunk branch January 30, 2025 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielebogo danielebogo danielebogo approved these changes

Assignees
No one assigned
Labels
Releases
Projects
None yet
Milestone
7.82 ❄️
Development

Successfully merging this pull request may close these issues.
3 participants
@SergioEstevao @dangermattic @danielebogo