Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
13145 commits 24 branches 75 tags 1.3 GiB
Commit graph

13145 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Rabert 8c53407a9d
Merge pull request #960 from nvllsvm/dock 
Use jellyfin/ffmpeg image
 2019-02-20 13:15:23 -05:00
Claus Vium 4a5c526ccc Fix logging args and add ilogger with categoryname 2019-02-20 19:08:47 +01:00
Andrew Rabert 69a81c0bc2 Use jellyfin/ffmpeg image 2019-02-20 12:11:50 -05:00
Bond_009 320707d44c Reduce string allocations at startup 2019-02-20 16:49:03 +01:00
Torsten 2690ac299b Only refresh metadata if extras changed 2019-02-20 16:39:49 +01:00
Torsten 268b099ca8 Merge branch 'populate-extras' of github.com:Liggy/jellyfin into populate-extras 2019-02-20 16:38:30 +01:00
Liggy 33171a58b5 Merge branch 'master' into populate-extras 2019-02-20 16:37:57 +01:00
PloughPuff 73c1cdb32a Avoid exceptions due to folder and file not found 
1) Use function to return path to temp transcode path which has benefit of creating temp folder if not exists, thereby avoiding the exception when GetFilePaths is used.
2) Check json files exists before attempting to read from it.  Avoids having to mask FileNotFound exceptions when debugging.
 2019-02-20 13:30:06 +00:00
Liggy 13bfe5093e
Merge branch 'master' into populate-extras 2019-02-20 14:24:23 +01:00
Bond-009 99bed9a9c3
Merge pull request #939 from joshuaboniface/cleanup-builds 
Clean up and rename obsolete deployment platforms
 2019-02-20 07:28:20 -05:00
Vasily 8ef41020d9
Merge pull request #847 from Bond-009/async 
Make websockets code async
 2019-02-20 15:03:42 +03:00
Bond-009 fca226bdfd
Add comment 2019-02-20 12:53:35 +01:00
Vasily bca7a26ffd
Merge branch 'master' into update_tvdb 2019-02-20 14:46:07 +03:00
Vasily 60df855b26
Merge pull request #930 from fruhnow/AuthorizationCheck 
checking user-permission in GetQueryResult
 2019-02-20 14:42:35 +03:00
Vasily 44ed037e73
Merge pull request #950 from cvium/replace_priority_queue 
Replace OptimizedPriorityQueue source with NuGet reference
 2019-02-20 14:39:52 +03:00
Vasily 50ce7572b4
Merge pull request #851 from Bond-009/appdata 
Simplify code to get data dir
 2019-02-20 14:31:01 +03:00
Vasily 74695428fe
Merge pull request #914 from Bond-009/httppostedfile 
Separate HttpPostedFile into it's own file
 2019-02-20 13:33:42 +03:00
Claus Vium 1f30a50f4a Address review comments 2019-02-20 11:03:04 +01:00
Joshua M. Boniface 6c6e9ca9f2
Merge pull request #889 from Bond-009/xmlex 
Fix uncaught xml error
 2019-02-19 21:31:16 -05:00
Joshua M. Boniface 89d4ce309d
Merge pull request #848 from Bond-009/perf 
Minor changes to reduce allocations
 2019-02-19 21:24:51 -05:00
Joshua M. Boniface b43317c5e1
Merge pull request #830 from Bond-009/update 
Removed remaining self-update code
 2019-02-19 21:21:36 -05:00
Torsten 5917e91447 Merge https://github.com/jellyfin/jellyfin into populate-extras 2019-02-19 23:21:40 +01:00
Torsten 9753a76905 Populate video extras again 2019-02-19 22:41:25 +01:00
Bond-009 d978ae1996
Merge pull request #948 from cvium/revert_movie_matching 
Revert movie matching
 2019-02-19 16:31:01 -05:00
Claus Vium 6016a27736 Check for whitespace 2019-02-19 22:30:21 +01:00
Vasily 24b76dbed8
Merge pull request #936 from EraYaN/fix-drone-abi-tests 
Fixed the assemblynames for compatibility check in drone.
 2019-02-20 00:22:09 +03:00
Claus Vium dab25a0eeb Remove OptimizedPriorityQueue source and grab it from nuget 2019-02-19 21:17:30 +01:00
Claus Vium 566646ad8b Remove limit comment 2019-02-19 19:44:22 +01:00
Claus Vium 6c1ca6f737 Remove arbitrary limit and minor style fixes 2019-02-19 19:33:41 +01:00
Claus Vium aa0c20afd5 Revert "Change multi version logic for movies" 
This reverts commit a4055779f6.
 2019-02-19 17:39:47 +01:00
Claus Vium 46acff4113 Revert "Remove unnecessary ToList" 
This reverts commit 42abb5a993.
 2019-02-19 17:39:30 +01:00
Claus Vium de5c0bab70 Revert "Add Year to the new VideoInfo" 
This reverts commit 05ad2e9b3f.
 2019-02-19 17:39:10 +01:00
Claus Vium 5181427234 Revert "Merge pull request #924 from cvium/fix_movie_matching" 
This reverts commit f274d024ce, reversing
changes made to 4b4399fba6.
 2019-02-19 17:34:43 +01:00
Claus Vium c79324154f Revert "Merge pull request #933 from cvium/fix_movie_matching_again" 
This reverts commit 77d4fec6eb, reversing
changes made to f274d024ce.
 2019-02-19 17:10:11 +01:00
Felix Ruhnow 53beebc774 switching logging to serilog convention according to pr comments 2019-02-19 12:17:28 +01:00
Felix Ruhnow ba003e06ef adressing pr comments 2019-02-19 12:09:39 +01:00
Felix Ruhnow 1d631540ac adressing pr comments 2019-02-19 12:06:50 +01:00
Joshua Boniface 3ed9d32f68 Rename Windows scripts folder 2019-02-18 22:07:53 -05:00
Joshua Boniface 3ecfd1fdd1 Rename framework to portable 2019-02-18 22:07:12 -05:00
Joshua Boniface 24574d4964 Rename MacOS build 2019-02-18 22:06:44 -05:00
Joshua Boniface 512ab8c6aa Remove unneeded Linux builds 2019-02-18 22:06:06 -05:00
Erwin de Haan 2ad54cd09d Fixed the assemblynames from drone since, the namespaces do not line up (yet). 2019-02-19 01:18:49 +01:00
Bond-009 77d4fec6eb
Merge pull request #933 from cvium/fix_movie_matching_again 
Semi-revert to prefer old movie grouping behaviour
 2019-02-18 16:48:05 -05:00
Claus Vium 29ff80d69c Minor style fixes 2019-02-18 22:02:16 +01:00
Claus Vium 4a700778e3 Semi-revert to prefer old movie grouping behaviour 2019-02-18 21:56:08 +01:00
Joshua M. Boniface 781cca0c82
Merge pull request #902 from brianjmurrell/copr-autobuild 
COPR auto building
 2019-02-18 13:53:59 -05:00
Andrew Rabert eab35890dc
Merge pull request #862 from EraYaN/abi-check-drone 
Add dotnet-compat ABI testing and Debug configuration building to drone-CI
 2019-02-18 13:11:06 -05:00
Felix Ruhnow 967d5deeb7 checking user-permission in GetQueryResult to prevent accessing the library without permission but having a link. (+added myself as contributor. forgot last time bout that) 2019-02-18 18:29:58 +01:00
Bond-009 51ba28bd65 Remove useless check 2019-02-18 17:37:10 +01:00
Bond_009 a94aeb5c87 Simplify code to get data dir 2019-02-18 17:35:09 +01:00