open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
pull/702/head
LukePulverenti 12 years ago
parent a2d215b6ae 4a46612c3f
commit 84507736a0
24 changed files with 2542 additions and 2420 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -145,6 +145,7 @@ publish/
# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
packages/
dlls/
# Windows Azure Build Output
csx

3
MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj
Unescape View File

@ -98,6 +98,9 @@
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

10
MediaBrowser.ApiInteraction/ApiClient.cs
Unescape View File

@ -656,7 +656,7 @@ namespace MediaBrowser.ApiInteraction
/// </summary>
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <returns>Task{DtoUserItemData}.</returns>
/// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackStartAsync(string itemId, Guid userId)
{
@ -686,7 +686,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="positionTicks">The position ticks.</param>
/// <returns>Task{DtoUserItemData}.</returns>
/// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
{
@ -718,7 +718,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="positionTicks">The position ticks.</param>
/// <returns>Task{DtoUserItemData}.</returns>
/// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
{
@ -749,7 +749,7 @@ namespace MediaBrowser.ApiInteraction
/// </summary>
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <returns>Task{DtoUserItemData}.</returns>
/// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task ClearUserItemRatingAsync(string itemId, Guid userId)
{
@ -774,7 +774,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="likes">if set to <c>true</c> [likes].</param>
/// <returns>Task{DtoUserItemData}.</returns>
/// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
{

3
MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
Unescape View File

@ -75,6 +75,9 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

3
MediaBrowser.Common/MediaBrowser.Common.csproj
Unescape View File

@ -228,6 +228,9 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

3
MediaBrowser.Controller/MediaBrowser.Controller.csproj
Unescape View File

@ -227,8 +227,7 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>

2
MediaBrowser.Model/DTO/UserItemDataDto.cs
Unescape View File

@ -4,7 +4,7 @@ using ProtoBuf;
namespace MediaBrowser.Model.Dto
{
/// <summary>
/// Class DtoUserItemData
/// Class UserItemDataDto
/// </summary>
[ProtoContract]
public class UserItemDataDto : INotifyPropertyChanged

3
MediaBrowser.Model/MediaBrowser.Model.csproj
Unescape View File

@ -125,8 +125,7 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

19
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
Unescape View File

@ -66,7 +66,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>9633DCDB4A07D3328EFB99299C6DFB1823EBC4BE</ManifestCertificateThumbprint>
@ -373,7 +373,22 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y</PostBuildEvent>
<PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y
if $(ConfigurationName) == Release (
xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y
mkdir "$(SolutionDir)..\Deploy\Server\System\x64"
xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y
mkdir "$(SolutionDir)..\Deploy\Server\System\x86"
xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y
mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins"
xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y
del
"$(SolutionDir)7za" a -tzip "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*"
)</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

3
MediaBrowser.UI.Controls/MediaBrowser.UI.Controls.csproj
Unescape View File

@ -97,6 +97,9 @@
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

3
MediaBrowser.UI/MediaBrowser.UI.csproj
Unescape View File

@ -1311,6 +1311,9 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

BIN
MediaBrowser.WebDashboard/Html/css/images/mblogoblackfull.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextblack.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextwhite.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
MediaBrowser.WebDashboard/Html/css/images/mblogowhitefull.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

14
MediaBrowser.WebDashboard/Html/css/site.css
Unescape View File

@ -100,10 +100,15 @@ pre, textarea.pre {
padding: 10px 0 10px 10px;
}
.imgLogo {
.imgLogoIcon {
height: 45px;
}
.imgLogoText {
height: 45px;
display: none;
}
.ui-popup-container {
z-index: 99999;
@ -268,8 +273,13 @@ form, .readOnlyContent {
@media all and (min-width: 650px) {
.imgLogo {
.imgLogoIcon {
height: 60px;
}
.imgLogoText {
height: 60px;
display: inline;
}
.header {

4
MediaBrowser.WebDashboard/Html/scripts/site.js
Unescape View File

@ -677,11 +677,11 @@ var Dashboard = {
if (page.hasClass('standalonePage')) {
headerHtml += '<img class="imgLogo" src="css/images/mblogoblackfull.png" />';
headerHtml += '<img class="imgLogoIcon" src="css/images/mblogoicon.png" /><img class="imgLogoText" src="css/images/mblogotextblack.png" />';
}
else if (isLibraryPage) {
headerHtml += '<img class="imgLogo" src="css/images/mblogowhitefull.png" />';
headerHtml += '<img class="imgLogoIcon" src="css/images/mblogoicon.png" /><img class="imgLogoText" src="css/images/mblogotextwhite.png" />';
}
headerHtml += '</a>';

9
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
Unescape View File

@ -159,12 +159,6 @@
<ItemGroup>
<EmbeddedResource Include="Html\scripts\IndexPage.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Html\css\images\mblogowhitefull.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Html\css\images\mblogoblackfull.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Html\css\images\defaultCollectionImage.png" />
</ItemGroup>
@ -395,6 +389,9 @@
<EmbeddedResource Include="Html\css\images\itemDetails\videoDefault.png" />
<EmbeddedResource Include="Html\css\images\itemDetails\audioDefault.png" />
<EmbeddedResource Include="Html\css\images\itemDetails\gameDefault.png" />
<Content Include="Html\css\images\mblogoicon.png" />
<Content Include="Html\css\images\mblogotextblack.png" />
<Content Include="Html\css\images\mblogotextwhite.png" />
<Content Include="Html\css\images\stars.png" />
<EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
</ItemGroup>

30
Nuget/MediaBrowser.ApiClient.nuspec
Unescape View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>MediaBrowser.ApiClient</id>
<version>3.0.0.0-beta</version>
<title>MediaBrowser.ApiInteraction</title>
<authors>Media Browser Team</authors>
<owners>Luke</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Description</description>
<copyright>Copyright © 2012</copyright>
<dependencies>
<group>
<dependency id="protobuf-net" version="2.0.0.621" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="ServiceStack.Text" version="3.9.37" />
</group>
<group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
<dependency id="Newtonsoft.Json" version="4.5.11" />
<dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
<dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
</group>
</dependencies>
</metadata>
<files>
<file src="dlls\MediaBrowser.ApiInteraction.dll" target="lib\net45\MediaBrowser.ApiInteraction.dll" />
<file src="dlls\MediaBrowser.ApiInteraction.Portable.dll" target="lib\portable-net45+sl4+wp71+win8\MediaBrowser.ApiInteraction.Portable.dll" />
</files>
</package>

18
Nuget/MediaBrowser.Common.nuspec
Unescape View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>1.0.1</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners />
<projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains common model objects and interfaces used by all Media Browser solutions.</description>
</metadata>
<files>
<file src="dlls\MediaBrowser.Common.dll" target="lib\net45\MediaBrowser.Common.dll" />
<file src="dlls\MediaBrowser.Model.dll" target="lib\net45\MediaBrowser.Model.dll" />
<file src="dlls\MediaBrowser.Model.dll" target="lib\portable-net4+sl4+wp7+win8\MediaBrowser.Model.dll" />
</files>
</package>

1
Nuget/MediaBrowser.Server.Core.nupkg.REMOVED.git-id
Unescape View File

@ -1 +0,0 @@
da3d30d634468465d8995ba6cb1c0872959b3e9c

19
Nuget/MediaBrowser.Server.Core.nuspec
Unescape View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>1.0.0</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners />
<projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains core components required to build plugins for Media Browser Server.</description>
<dependencies>
<dependency id="MediaBrowser.Common" version="1.0.1" />
</dependencies>
</metadata>
<files>
<file src="dlls\MediaBrowser.Controller.dll" target="lib\net45\MediaBrowser.Controller.dll" />
</files>
</package>

20
Nuget/MediaBrowser.Theater.Core.nuspec
Unescape View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Theater.Core</id>
<version>1.0.0</version>
<title>MediaBrowser.Theater.Core</title>
<authors>Media Browser Team</authors>
<owners />
<projectUrl>https://github.com/MediaBrowser/MediaBrowser.Theater</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains components required to build plugins for Media Browser Theater.</description>
<dependencies>
<dependency id="MediaBrowser.Common" version="1.0.1" />
</dependencies>
</metadata>
<files>
<file src="dlls\MediaBrowser.UI.Controls.dll" target="lib\net45\MediaBrowser.UI.Controls.dll" />
<file src="dlls\MediaBrowser.UI.dll" target="lib\net45\MediaBrowser.UI.dll" />
</files>
</package>
Write Preview
Loading…
Cancel
Save