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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Michalis Adamidis 2014-09-14 18:52:46 +02:00
commit 8557f26679
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ namespace MediaBrowser.Server.Implementations.Connect
private string GetConnectUrl(string handler) private string GetConnectUrl(string handler)
{ {
return "http://mb3admin.com/test/connect/" + handler; return "https://connect.mediabrowser.tv/service/" + handler;
} }
public async Task LinkUser(string userId, string connectUsername) public async Task LinkUser(string userId, string connectUsername)
@ -293,12 +293,6 @@ namespace MediaBrowser.Server.Implementations.Connect
var user = GetUser(userId); 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)) if (!string.IsNullOrWhiteSpace(user.ConnectUserId))
{ {
await RemoveLink(user, connectUser).ConfigureAwait(false); 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.", "MessageYouHaveAnActiveRecurringMembership": "You have an active {0} membership. You can upgrade your plan using the options below.",
"ButtonDelete": "Delete", "ButtonDelete": "Delete",
"HeaderMediaBrowserAccountAdded": "Media Browser Account Added", "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."
} }