mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode
# Conflicts: # src/components/guide/guide.js # src/components/mediainfo/mediainfo.js # src/components/multiselect/multiselect.js # src/components/playback/brightnessosd.js # src/components/recordingcreator/recordingbutton.js # src/components/userdatabuttons/emby-ratingbutton.js # src/controllers/favorites.js
This commit is contained in:
commit
080b3365d6
145 changed files with 1438 additions and 4767 deletions
|
@ -156,7 +156,8 @@ define(["userSettings"], function (userSettings) {
|
|||
html += '<h2 style="margin:0 0 .5em;">';
|
||||
html += Globalize.translate("HeaderSortBy");
|
||||
html += "</h2>";
|
||||
var i, length;
|
||||
var i;
|
||||
var length;
|
||||
var isChecked;
|
||||
html += '<div>';
|
||||
for (i = 0, length = options.items.length; i < length; i++) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue