lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update login page

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-05 19:15:47 -04:00
parent 4b83dd4b56
commit 32454bdfe1
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -496,7 +496,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns>``0.</returns>
protected T FindParent<T>()
public T FindParent<T>()
where T : Folder
{
return Parents.OfType<T>().FirstOrDefault();

6
MediaBrowser.Server.Implementations/Library/UserManager.cs
View File

@ -281,10 +281,10 @@ namespace MediaBrowser.Server.Implementations.Library
if (newValue >= maxCount)
{
_logger.Debug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
user.Policy.IsDisabled = true;
//_logger.Debug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
//user.Policy.IsDisabled = true;
fireLockout = true;
//fireLockout = true;
}
await UpdateUserPolicy(user, user.Policy, false).ConfigureAwait(false);

7
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -440,7 +440,7 @@
"HeaderVideo": "Video",
"HeaderRuntime": "Runtime",
"HeaderCommunityRating": "Community rating",
"HeaderPasswordReset": "Password Reset",
"HeaderPasswordReset": "Password Reset",
"HeaderParentalRating": "Parental rating",
"HeaderReleaseDate": "Release date",
"HeaderDateAdded": "Date added",
@ -767,5 +767,8 @@
"SyncJobItemStatusCancelled": "Cancelled",
"LabelProfile": "Profile:",
"LabelBitrateMbps": "Bitrate (Mbps):",
"EmbyIntroDownloadMessage": "To download and install Emby Server visit {0}."
"EmbyIntroDownloadMessage": "To download and install Emby Server visit {0}.",
"ButtonNewServer": "New Server",
"ButtonSignInWithConnect": "Sign in with Emby Connect",
"HeaderNewServer": "New Server"
}

6
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -1441,11 +1441,11 @@
"EmbyIntroMessage": "With Emby you can easily stream videos, music and photos to smart phones, tablets and other devices from your Emby Server.",
"ButtonSkip": "Skip",
"TextConnectToServerManually": "Connect to server manually",
"ButtonNewServer": "New Server",
"ButtonSignInWithConnect": "Sign in with Emby Connect",
"HeaderNewServer": "New Server",
"ButtonConnect": "Connect",
"LabelServerHost": "Host:",
"LabelServerHostHelp": "192.168.1.100 or https://myserver.com",
"LabelServerPort": "Port:"
"LabelServerPort": "Port:",
"HeaderNewServer": "New Server",
"ButtonChangeServer": "Change Server"
}

2
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -93,7 +93,7 @@
<Content Include="dashboard-ui\css\images\kids\bg.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\server.png">
<Content Include="dashboard-ui\css\images\logo536.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\splash.jpg">