diff --git a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
index 4ad63b2e3..9ba2effd3 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
@@ -24,7 +24,10 @@ namespace MediaBrowser.Common.Implementations
///
/// Gets the path to the system folder
///
- public string ProgramSystemPath { get { return Path.Combine(ProgramDataPath, "system"); } }
+ public string ProgramSystemPath
+ {
+ get { return Path.GetDirectoryName(ApplicationPath); }
+ }
///
/// The _data directory
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index dc077c69c..3bd24122c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -783,8 +783,9 @@
"MessageUnlockAppWithSupporter": "Unlock the full features of the app by signing in with an active Emby Supporter Membership.",
"MessageToValidateSupporter": "To validate your Emby Supporter Membership, simply sign into the app using your Wifi connection within your home network.",
"MessagePaymentServicesUnavailable": "Payment services are currently unavailable. Please try again later.",
- "ButtonUnlockWithSupporter": "Unlock with Emby Supporter Membership",
+ "ButtonUnlockWithSupporter": "Sign in with Emby Supporter Membership",
"MessagePleaseSignInLocalNetwork": "Before proceeding, please ensure that you're connected to your local network using a Wifi or LAN connection.",
"ButtonUnlockWithPurchase": "Unlock with Purchase",
- "MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience."
+ "MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience.",
+ "OptionEnableFullscreen": "Enable Fullscreen"
}
diff --git a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
index 9f3e44cb0..08c8a4dea 100644
--- a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
+++ b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
@@ -21,27 +21,38 @@ namespace MediaBrowser.ServerApplication.Updates
version = File.ReadAllText(archive + ".ver");
}
+ var systemPath = appPaths.ProgramSystemPath;
+ var tempPath = Path.GetTempPath();
+
// Use our installer passing it the specific archive
// We need to copy to a temp directory and execute it there
- var source = Path.Combine(appPaths.ProgramSystemPath, UpdaterExe);
+ var source = Path.Combine(systemPath, UpdaterExe);
logger.Info("Copying updater to temporary location");
- var tempUpdater = Path.Combine(Path.GetTempPath(), UpdaterExe);
+ var tempUpdater = Path.Combine(tempPath, UpdaterExe);
File.Copy(source, tempUpdater, true);
- source = Path.Combine(appPaths.ProgramSystemPath, UpdaterDll);
- var tempUpdaterDll = Path.Combine(Path.GetTempPath(), UpdaterDll);
+ source = Path.Combine(systemPath, UpdaterDll);
+ var tempUpdaterDll = Path.Combine(tempPath, UpdaterDll);
logger.Info("Copying updater dependencies to temporary location");
File.Copy(source, tempUpdaterDll, true);
- const string product = "server";
+ var product = "server";
// Our updater needs SS and ionic
- source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll");
- File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true);
- source = Path.Combine(appPaths.ProgramSystemPath, "SharpCompress.dll");
- File.Copy(source, Path.Combine(Path.GetTempPath(), "SharpCompress.dll"), true);
+ source = Path.Combine(systemPath, "ServiceStack.Text.dll");
+ File.Copy(source, Path.Combine(tempPath, "ServiceStack.Text.dll"), true);
+ source = Path.Combine(systemPath, "SharpCompress.dll");
+ File.Copy(source, Path.Combine(tempPath, "SharpCompress.dll"), true);
logger.Info("Starting updater process.");
- Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\"", product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath));
+
+ // installpath = program data folder
+ // startpath = executable to launch
+ // systempath = folder containing installation
+ var args = string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\" startpath=\"{6}\" systempath=\"{7}\"",
+ product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath, appPaths.ApplicationPath, systemPath);
+
+ logger.Info("Args: {0}", args);
+ Process.Start(tempUpdater, args);
// That's it. The installer will do the work once we exit
}
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index f6601ce80..15aed6819 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -553,6 +553,7 @@ namespace MediaBrowser.WebDashboard.Api
"syncjob.js",
"appservices.js",
"playlistmanager.js",
+ "appsettings.js",
"mediaplayer.js",
"mediaplayer-video.js",
@@ -602,10 +603,6 @@ namespace MediaBrowser.WebDashboard.Api
"metadatanfo.js",
"moviecollections.js",
- "mypreferencesdisplay.js",
- "mypreferenceslanguages.js",
- "mypreferenceswebclient.js",
-
"notifications.js",
"notificationlist.js",
"notificationsetting.js",
@@ -623,7 +620,6 @@ namespace MediaBrowser.WebDashboard.Api
"syncsettings.js",
"thememediaplayer.js",
"useredit.js",
- "myprofile.js",
"userpassword.js",
"userprofilespage.js",
"userparentalcontrol.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 3871cb9d6..f7f7f23dd 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -138,6 +138,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -156,6 +159,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 6fbe36048..c576e56f1 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
using System.Reflection;
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5621.4")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5621.4")]