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.

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

Fix merge conflict with development #551

Conversation

elpiel
Copy link
Member

@elpiel elpiel commented Nov 1, 2023

No description provided.

TheBeastLT and others added 30 commits September 27, 2023 08:22
Signed-off-by: Lachezar Lechev <[email protected]>
…semver

Chore: Update deps and re-export semver::Version
Remove stream from bucket upon addon uninstall
…roxying

Resolve stream proxied streaming link when url has request headers
…-resource

fix: do not request lastVideos resource if there are no ids
unclekingpin and others added 20 commits October 22, 2023 02:11
…ails

feat: MetaDetails - guess streams only when a flag is present
chore: add test for migration to v8
Signed-off-by: Lachezar Lechev <[email protected]>
…l-and-exit-fullscreen

feat: Profile Settings - controls & esc for exiting fullscreen
Local search was loading upon instantiation
Signed-off-by: Lachezar Lechev <[email protected]>
@elpiel elpiel marked this pull request as ready for review November 1, 2023 15:23
@TheBeastLT TheBeastLT merged commit 922ca40 into feature/suggested-stream-for-meta-details Nov 4, 2023
@TheBeastLT TheBeastLT deleted the fix-merge-conflict-with-development branch November 4, 2023 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants