Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #424 from dkanada/submodule

Browse Source 
add jellyfin-web as submodule
This commit is contained in:
Andrew Rabert 2019-01-09 22:05:11 -05:00 committed by GitHub
commit 7a832045d6
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -234,7 +234,6 @@ pip-log.txt
#Mr Developer #Mr Developer
.mr.developer.cfg .mr.developer.cfg
MediaBrowser.WebDashboard/dashboard-ui/.idea/
/.vs /.vs
########## ##########

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "ThirdParty/taglib-sharp"] [submodule "ThirdParty/taglib-sharp"]
path = ThirdParty/taglib-sharp path = ThirdParty/taglib-sharp
url = https://github.com/mono/taglib-sharp.git 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

1
MediaBrowser.Controller/IServerApplicationPaths.cs
View File

@ -12,7 +12,6 @@ namespace MediaBrowser.Controller
/// <summary> /// <summary>
/// Gets the application resources path. This is the path to the folder containing resources that are deployed as part of the application /// 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> /// </summary>
/// <value>The application resources path.</value> /// <value>The application resources path.</value>
string ApplicationResourcesPath { get; } string ApplicationResourcesPath { get; }

6
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -138,9 +138,9 @@ namespace MediaBrowser.WebDashboard.Api
} }
/// <summary> /// <summary>
/// Gets the dashboard UI path. /// Gets the path for the web interface.
/// </summary> /// </summary>
/// <value>The dashboard UI path.</value> /// <value>The path for the web interface.</value>
public string DashboardUIPath public string DashboardUIPath
{ {
get get
@ -150,7 +150,7 @@ namespace MediaBrowser.WebDashboard.Api
return _serverConfigurationManager.Configuration.DashboardSourcePath; return _serverConfigurationManager.Configuration.DashboardSourcePath;
} }
return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "dashboard-ui"); return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web", "src");
} }
} }

2
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -10,7 +10,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="dashboard-ui\**\*.*"> <None Include="jellyfin-web\src\**\*.*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>

1
MediaBrowser.WebDashboard/jellyfin-web Submodule

@ -0,0 +1 @@
Subproject commit 4678528d0028685b45c7c6daa2e24b72a363535b