mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Merge pull request #424 from dkanada/submodule
add jellyfin-web as submodule
This commit is contained in:
commit
7a832045d6
6 changed files with 8 additions and 6 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -234,7 +234,6 @@ pip-log.txt
|
|||
|
||||
#Mr Developer
|
||||
.mr.developer.cfg
|
||||
MediaBrowser.WebDashboard/dashboard-ui/.idea/
|
||||
/.vs
|
||||
|
||||
##########
|
||||
|
|
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +1,6 @@
|
|||
[submodule "ThirdParty/taglib-sharp"]
|
||||
path = ThirdParty/taglib-sharp
|
||||
url = https://github.com/mono/taglib-sharp.git
|
||||
[submodule "MediaBrowser.WebDashboard/jellyfin-web"]
|
||||
path = MediaBrowser.WebDashboard/jellyfin-web
|
||||
url = https://github.com/jellyfin/jellyfin-web.git
|
||||
|
|
|
@ -12,7 +12,6 @@ namespace MediaBrowser.Controller
|
|||
|
||||
/// <summary>
|
||||
/// Gets the application resources path. This is the path to the folder containing resources that are deployed as part of the application
|
||||
/// For example, this folder contains dashboard-ui and swagger-ui
|
||||
/// </summary>
|
||||
/// <value>The application resources path.</value>
|
||||
string ApplicationResourcesPath { get; }
|
||||
|
|
|
@ -138,9 +138,9 @@ namespace MediaBrowser.WebDashboard.Api
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the dashboard UI path.
|
||||
/// Gets the path for the web interface.
|
||||
/// </summary>
|
||||
/// <value>The dashboard UI path.</value>
|
||||
/// <value>The path for the web interface.</value>
|
||||
public string DashboardUIPath
|
||||
{
|
||||
get
|
||||
|
@ -150,7 +150,7 @@ namespace MediaBrowser.WebDashboard.Api
|
|||
return _serverConfigurationManager.Configuration.DashboardSourcePath;
|
||||
}
|
||||
|
||||
return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "dashboard-ui");
|
||||
return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web", "src");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="dashboard-ui\**\*.*">
|
||||
<None Include="jellyfin-web\src\**\*.*">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
|
1
MediaBrowser.WebDashboard/jellyfin-web
Submodule
1
MediaBrowser.WebDashboard/jellyfin-web
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 4678528d0028685b45c7c6daa2e24b72a363535b
|
Loading…
Reference in a new issue