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

Update Library Settings #3143

Merged
merged 6 commits into from Nov 10, 2021
Merged

Update Library Settings #3143

merged 6 commits into from Nov 10, 2021

Conversation

WWWesten
Copy link
Contributor

@WWWesten WWWesten commented Nov 4, 2021

Changes
Fix localisation's handling in libraryoptionseditor.js, unification of styling of labels

Issues

dkanada
dkanada reviewed Nov 5, 2021
View reviewed changes
src/strings/en-us.json Outdated Show resolved Hide resolved
dmitrylyzo
dmitrylyzo reviewed Nov 6, 2021
View reviewed changes
src/strings/en-us.json Outdated Show resolved Hide resolved
dmitrylyzo
dmitrylyzo reviewed Nov 6, 2021
View reviewed changes
Copy link
Contributor

@dmitrylyzo dmitrylyzo left a comment

Choose a reason for hiding this comment

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

It might also be a good idea to rebase your branch onto the upstream master and squash the commits so that the history is clean. I'm not sure if this is possible through Github.

I know you're working directly on the master branch, but I think it is safe to force-push since no one else is working on it. Next time it is better to create a separate branch.

src/strings/en-us.json Outdated Show resolved Hide resolved
src/strings/en-us.json Show resolved Hide resolved
@WWWesten
Copy link
Contributor Author

WWWesten commented Nov 8, 2021

@thornbill @dkanada What about review and approval? ;)

@WWWesten
Copy link
Contributor Author

Merging is blocked
The base branch restricts merging to authorized users. Learn more about protected branches.
Hi @thornbill. And the merging. When?

WWWesten and others added 6 commits November 10, 2021 09:49
@WWWesten @thornbill
Update Library Settings
3c56f85 
Fix localisation's handling in libraryoptionseditor.js, unification of styling of labels
@WWWesten @thornbill
Update en-us.json
dee072f 
Fix missing colon
@WWWesten @thornbill
Update Libray Options Editor
4938081 
Update librayoptionseditor.js and en-us.json
@WWWesten @thornbill
Update en-us.json
4752593
@WWWesten @thornbill
Update en-us.json
3b9776d
@WWWesten @dmitrylyzo @thornbill
Update src/strings/en-us.json
82a6fb8 
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
@thornbill
Copy link
Member

Hey @WWWesten I was just trying to cleanup the merge commits before merging. I will get it merged as soon as the checks pass now.

@sonarcloud
Copy link

sonarcloud bot commented Nov 10, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@thornbill thornbill merged commit d34b04a into jellyfin:master Nov 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkanada dkanada dkanada left review comments

@dmitrylyzo dmitrylyzo dmitrylyzo left review comments

@thornbill thornbill thornbill 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.

None yet
4 participants
@WWWesten @thornbill @dkanada @dmitrylyzo