Commit Graph

12127 Commits (0c1b9d3bff7041b7d3b875885b8745680afcee72)
 

Author SHA1 Message Date
Bond_009 0c1b9d3bff Rebase
6 years ago
Bond_009 a8fde5e89c Readded some stuff
6 years ago
Bond_009 6d9ee138d6 More log dir configurable
6 years ago
Bond_009 a51798dd8d Added logging.json file
6 years ago
Bond_009 88f5471fe3 Pls stop crashing
6 years ago
Bond_009 b7ebb67cbb Remove the need for NullLogger
6 years ago
Bond_009 3d3ec3588b Mark where ILogger is being set to null
6 years ago
Bond_009 0f8b3c6347 Use Microsoft.Extensions.Logging abstraction
6 years ago
Vasily b0fd432126 Merge pull request #334 from jellyfin/master
6 years ago
Joshua M. Boniface 170dd3adac Merge pull request #330 from Bond-009/xmltv
6 years ago
Bond_009 f31457a457 Final cleanup
6 years ago
Bond_009 9ff45cf969 Some voodoo magic to stop a crash
6 years ago
Bond_009 589aa2416a Clean up XmlTvListeningProvider
6 years ago
Bond_009 baa2afb61e Restore latest version
6 years ago
Bond_009 6ebb00549b Add missing XmlTvListingsProvider
6 years ago
Bond_009 76d3f60f06 Fix NullRefException
6 years ago
Bond_009 69cf9e8fc4 Give more info on error
6 years ago
Joshua M. Boniface 76b647e0a8 Merge pull request #325 from jellyfin/dev
6 years ago
Joshua M. Boniface d10d632c48 Merge pull request #323 from joshuaboniface/gitattributes
6 years ago
Joshua M. Boniface 9d91fa8ab8 Merge pull request #321 from EraYaN/fix-issue-320
6 years ago
Joshua M. Boniface 64a1a7560e Merge branch 'dev' into fix-issue-320
6 years ago
Joshua Boniface b306758836 Add merge=union for CONTRIBUTORS.md
6 years ago
Erwin de Haan ff88936f8b Update CONTRIBUTORS.md
6 years ago
Erwin de Haan 9c1c29325d Added extra extension method that create a new instance of the destination object.
6 years ago
Erwin de Haan de7fcaadb3 Fixed #320 by adding an extension method to BaseItem to make a deep copy of an object.
6 years ago
Joshua M. Boniface aac1007bdc Merge pull request #317 from Bond-009/csproj
6 years ago
Joshua M. Boniface 345c3e496a Merge pull request #313 from LogicalPhallacy/master
6 years ago
LogicalPhallacy 0c52f448a0 Rename installjellyfin.bat to install.bat
6 years ago
LogicalPhallacy b3e0656ab2 Rename Build-JellyFin.ps1 to build-jellyfin.ps1
6 years ago
Bond_009 b0ca979bed MediaBrowser.MediaEncoding use same layout/style as other csprojs
6 years ago
Vasily 6e5d31bbec Merge pull request #316 from bfayers/replace-all-wiki-links
6 years ago
bfayers 681dd2686b add myself to contributors
6 years ago
Joshua M. Boniface 77a15fe404 Merge pull request #314 from Bond-009/fix303
6 years ago
Bond_009 ab8df3741d Fixes possible NullReferenceException
6 years ago
Phallacy e222c2deb1 fixed installer custom library path
6 years ago
Phallacy b4be09898c added back win install scripts2
6 years ago
Phallacy 6f8cd361e1 added back win install scripts
6 years ago
Joshua M. Boniface 7889c9d355 Merge pull request #305 from flemse/show-wan-ip
6 years ago
Anthony Lavado 61db95f7af Merge pull request #304 from joshuaboniface/file-header
6 years ago
Flemming Thesbjerg a91a28c408 re-adds wan ip on dashboard by requesting it from http://ipv4.icanhazip.com
6 years ago
Joshua M. Boniface bc6e876849 Add a better wording here
6 years ago
Joshua Boniface 6455623b4a Add new file header to use as a base for new files
6 years ago
Joshua M. Boniface 1f0b83c66a Merge pull request #301 from nvllsvm/fix-default-language
6 years ago
Andrew Rabert 4929ee9ab6 Fix default language
6 years ago
Andrew Rabert 9c49e936f0 Merge pull request #288 from Bond-009/toarray
6 years ago
Vasily dc4a6026a5 Merge pull request #299 from nvllsvm/rmcoc
6 years ago
Andrew Rabert b29aaed307 Remove CoC
6 years ago
Joshua M. Boniface 5ed0504cfb Merge pull request #298 from nvllsvm/disable_plugin_updates
6 years ago
Andrew Rabert c2a6a2119a Disable plugin updates
6 years ago
Vasily da0ae0d64f Merge pull request #290 from joshuaboniface/debian-gpl-tweaks
6 years ago