diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index bbc3b6fd31..8b6cbdc931 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -496,7 +496,7 @@ namespace MediaBrowser.Controller.Entities
///
///
/// ``0.
- protected T FindParent()
+ public T FindParent()
where T : Folder
{
return Parents.OfType().FirstOrDefault();
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 02e1795f36..5012f24798 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -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);
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 3fe1b7492e..9aa09a75bb 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -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"
}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 1297ec0fc4..ff99c40786 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -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"
}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 0da2d56606..e39df9602c 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -93,7 +93,7 @@
PreserveNewest
-
+
PreserveNewest