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

update websocketsharp

Browse Source
This commit is contained in:
Luke Pulverenti 2014-09-14 12:45:09 -04:00
parent 41816585ed
commit 31ed30d584
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@ -293,12 +293,6 @@ namespace MediaBrowser.Server.Implementations.Connect
var user = GetUser(userId);
// See if it's already been set.
if (string.Equals(connectUser.Id, user.ConnectUserId, StringComparison.OrdinalIgnoreCase))
{
return;
}
if (!string.IsNullOrWhiteSpace(user.ConnectUserId))
{
await RemoveLink(user, connectUser).ConfigureAwait(false);

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

@ -453,5 +453,5 @@
"MessageYouHaveAnActiveRecurringMembership": "You have an active {0} membership. You can upgrade your plan using the options below.",
"ButtonDelete": "Delete",
"HeaderMediaBrowserAccountAdded": "Media Browser Account Added",
"MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email has been sent to the owner of the account. They will need to confirm the invitation by clicking a link within the email."
"MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email."
}