mirror of
https://github.com/Jellyfin2Samsung/Samsung-Jellyfin-Installer.git
synced 2026-03-01 11:21:12 +03:00
Add user settings to improve user experience and handling #5
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Originally created by @jeppevinkel on GitHub (May 18, 2025).
Originally assigned to: @PatrickSt1991 on GitHub.
Not all users have their windows set to the language they prefer to use in software, so it could help with a language switcher in the UI.
@PatrickSt1991 commented on GitHub (May 31, 2025):
@PatrickSt1991 commented on GitHub (Jun 3, 2025):
@jeppevinkel the branch feature/language-selector contains significant changes to the application, giving user more options and choices.
Maybe you can check if the responsiveness is inline with your PR?
Also I could use some help with merging this one cause last time I tried to merge it, I broke it :( unfortunately GIT isn't my expertise
@jeppevinkel commented on GitHub (Jun 3, 2025):
The state with the branching looks a bit weird since it claims it has no commits ahead of master. Based on the commit history on master I assume it's because you merged it already and then reverted the commits in a separate commit? That might need a little git-fu to unwind again.
@jeppevinkel commented on GitHub (Jun 3, 2025):
I'll see if I get some time to check it out tomorrow. It's too late for me to start today.
@PatrickSt1991 commented on GitHub (Jun 3, 2025):
Yeah I fucked it up a bit, i merged master into the feature branch apparently but don't know when or how I did that 😅
This commit was the last correct one for master
38dfe0b, but ofcourse thats missing your PRAnd this commit was the latest correct one for the feature branch
37c7691@jeppevinkel commented on GitHub (Jun 3, 2025):
I tried to see if I could edit the commit history last night, but that is a bit difficult. The easiest solution might be to merge everything into the feature branch and then do a revert of the revert and try to fix it on the feature branch after that.
@PatrickSt1991 commented on GitHub (Jun 3, 2025):
Okay thanks for trying, I'll give it a go
@PatrickSt1991 commented on GitHub (Jun 3, 2025):
@jeppevinkel managed to merge all the features, I had to do it all in a new branch, so the master branch is a new different master branch.
previous master is now master-old
Not ideal but at least all of the new code and improvements are merged in to master