michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
12,644 Commits 2 Branches 79 Tags 73 MiB
b2ffad9ce9
Commit Graph

12644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus Vium
b2ffad9ce9 Set Parent to current query Item if ParentId is empty (#680) 
**Changes**
Fixed a faulty change in logic that occurred during the Christmas GPL nightmare.

I stepped through Emby 3.5.2 and stumbled over a difference in the query between Jellyfin and Emby, where in Emby, query.ParentId was set to the item itself. So I did a little digging in the old GPLv2 source and found this https://github.com/MediaBrowser/Emby/blob/3.4.1.8/MediaBrowser.Controller/Entities/Folder.cs#L720

**Issues**
Fixes #673
 2019-01-24 18:48:37 +01:00
Andrew Rabert
bd550ef996 Fix arm32 Docker 2019-01-22 20:25:41 -05:00
Andrew Rabert
becbad981c Merge pull request #535 from Bond-009/streambuilder 
Clean up streambuilder
 2019-01-22 19:40:59 -05:00
Andrew Rabert
3d01aa1ae4 Merge pull request #656 from hawken93/more_logging 
Do some logging in MediaInfoService
 2019-01-22 19:38:43 -05:00
Joshua M. Boniface
0fec7994a8 Merge pull request #663 from nvllsvm/tl 
Use TagLibSharp Nuget package
 2019-01-22 19:35:09 -05:00
Andrew Rabert
090fea21ea Merge pull request #668 from hawken93/prepare_for_reports_module 
Return Audio objects from MusicAlbum.Tracks
 2019-01-22 19:34:29 -05:00
Andrew Rabert
52dd570142 Merge pull request #671 from Tthecreator/dev 
Set EnableRaisingEvents correctly
 2019-01-22 19:31:33 -05:00
Andrew Rabert
28483bdb54 Merge pull request #651 from jellyfin/release-10.1.0 
Release 10.1.0
 2019-01-22 18:13:47 -05:00
Tthecreator
cce90d2b56 removed excess newlines 2019-01-22 19:42:58 +01:00
Joshua Boniface
8106c8393b Update jellyfin-web submodule to 10.1.0 2019-01-22 13:16:42 -05:00
Tthecreator
0b80902cc8 Set EnableRaisingEvents correctly for SubtitleEncoder 2019-01-22 16:52:26 +01:00
Tthecreator
189b99df16 Merge pull request #1 from jellyfin/dev 
Update from jellyfin repo
 2019-01-22 15:22:42 +00:00
hawken
490e22c790 Add comments to SqliteItemRepository to help out whoever is next 2019-01-22 12:20:36 +00:00
hawken
a356c1417a Change MusicAlbum.Tracks to return Audio items 2019-01-22 12:19:50 +00:00
hawken
07cba6cbcf Do some logging in MediaInfoService 2019-01-22 10:24:00 +00:00
Joshua Boniface
411139cd78 Update changelogs to add #666 2019-01-21 23:56:02 -05:00
Anthony Lavado
29f3330091 Merge pull request #666 from nvllsvm/cross-platform 
Add cross-platform build for arm64
 2019-01-21 23:55:17 -05:00
Andrew Rabert
8108e295dc Add Dockerfile.arm64 docs 2019-01-21 23:43:13 -05:00
Andrew Rabert
aa25dd1a0b Update to .NETCore 3.0 2019-01-21 23:17:56 -05:00
Andrew Rabert
23c52c3fb9 Disable cross-platform build for arm32v7 
https://github.com/jellyfin/jellyfin/issues/665
 2019-01-21 23:17:30 -05:00
Andrew Rabert
a5aa482b6c Update arm/arm64 images to build cross-platform 
These Dockerfiles can not be built natively - must be built on x86_64
 2019-01-21 22:47:51 -05:00
Joshua Boniface
8d298e0e36 Update changelogs to remove #639, add #661, #54 2019-01-21 21:24:28 -05:00
Andrew Rabert
13f1ea2c19 Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1 
Revert "Fix segment_time_delta for ffmpeg 4.1"
 2019-01-21 20:21:36 -05:00
Andrew Rabert
9ad182502f Merge pull request #661 from Bond-009/streamstate 
Fix NullRef from progress report
 2019-01-21 20:05:43 -05:00
Joshua M. Boniface
b2767eceff Revert "Fix segment_time_delta for ffmpeg 4.1" 2019-01-21 19:29:47 -05:00
Andrew Rabert
bc8a0eeead Use TagLibSharp Nuget package 2019-01-21 19:22:08 -05:00
Bond_009
73df5bdbe9 Fix NullRef 2019-01-21 23:50:47 +01:00
Joshua Boniface
e6b95db132 Add jellyfin-web#53 to changelogs 2019-01-21 16:34:53 -05:00
Joshua Boniface
e30cf63aef Add helpful time text around platform builds 2019-01-21 16:34:53 -05:00
Joshua M. Boniface
571afa4fe2 Merge pull request #655 from joshuaboniface/local-web-branch 
Support trying local branches in submodule
 2019-01-21 13:28:40 -05:00
Joshua Boniface
42f2799d66 Add jellyfin-web#52 to changelogs 2019-01-21 13:25:26 -05:00
Joshua Boniface
384f867228 Update changelogs to include this PR 2019-01-21 12:57:46 -05:00
Joshua Boniface
cf85e2327e Support trying local branches in submodule 2019-01-21 12:48:27 -05:00
Bond_009
2f8f9e6853 Address comments 2019-01-21 16:57:10 +01:00
Bond_009
06d9423f00 Clean up last bits 2019-01-21 16:48:45 +01:00
Bond_009
37be6c87eb Make ConditionProcessor static 2019-01-21 16:48:45 +01:00
Bond_009
c9b88ab741 Clean up streambuilder 2019-01-21 16:48:45 +01:00
Joshua Boniface
0dab69b551 Use basename for cross-platform operation 
Trying to sed out the deployment/ failed on MacOS, so use the
basename command instead for the same effect.
 2019-01-21 01:42:25 -05:00
Joshua Boniface
ff4cbfc6df Fix inconsistencies in changelogs 2019-01-21 00:02:56 -05:00
Joshua Boniface
c72144111e Correct bad signature line 2019-01-21 00:02:56 -05:00
Joshua M. Boniface
3518400b22 Merge branch 'master' into release-10.1.0 2019-01-20 23:48:23 -05:00
Joshua Boniface
adf037c44c Complete and remove todo from bump_version 2019-01-20 23:41:37 -05:00
Joshua Boniface
73038ee3f7 Bump version to 10.1.0 2019-01-20 23:39:55 -05:00
Andrew Rabert
920c39454c Merge pull request #646 from Tthecreator/master 
Fix infinite loop bug on subtitle.m3u8 request
 2019-01-20 21:16:28 -05:00
Andrew Rabert
edcfd8b565 Merge pull request #631 from Bond-009/imagesize 
Cleanup ImageProcessor and SkiaEncoder
 2019-01-20 20:49:51 -05:00
Andrew Rabert
7327bb91a3 Fix func name 2019-01-20 20:48:24 -05:00
Andrew Rabert
6a5488c651 Formatting 2019-01-20 20:47:02 -05:00
Andrew Rabert
1cf1e9bfa1 Update appPaths position 2019-01-20 20:46:40 -05:00
Andrew Rabert
7469ed4e6e Update logger position 2019-01-20 20:46:00 -05:00
Andrew Rabert
c7f648f86a Merge branch 'dev' into imagesize 2019-01-20 20:45:06 -05:00