pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,129 Commits 29 Branches 75 Tags 1.3 GiB
Commit Graph

12129 Commits

Author SHA1 Message Date
Bond_009 ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009 bf01918659 Clean up 2018-12-30 22:44:38 +01:00
Bond_009 0c1b9d3bff Rebase 2018-12-30 22:44:38 +01:00
Bond_009 a8fde5e89c Readded some stuff 2018-12-30 22:44:38 +01:00
Bond_009 6d9ee138d6 More log dir configurable 2018-12-30 22:44:38 +01:00
Bond_009 a51798dd8d Added logging.json file 2018-12-30 22:44:38 +01:00
Bond_009 88f5471fe3 Pls stop crashing 2018-12-30 22:44:38 +01:00
Bond_009 b7ebb67cbb Remove the need for NullLogger 2018-12-30 22:44:38 +01:00
Bond_009 3d3ec3588b Mark where ILogger is being set to null 2018-12-30 22:44:38 +01:00
Bond_009 0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
Vasily b0fd432126 Merge pull request #334 from jellyfin/master 
Merge pull request #325 from jellyfin/dev
 2018-12-31 00:39:05 +03:00
Joshua M. Boniface 170dd3adac Merge pull request #330 from Bond-009/xmltv 
Fix XMLTV error
 2018-12-30 16:19:24 -05:00
Bond_009 f31457a457 Final cleanup 2018-12-30 20:21:48 +01:00
Bond_009 9ff45cf969 Some voodoo magic to stop a crash 2018-12-30 18:30:29 +01:00
Bond_009 589aa2416a Clean up XmlTvListeningProvider 2018-12-30 18:21:49 +01:00
Bond_009 baa2afb61e Restore latest version 
Source: 30baa15839/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
 2018-12-30 17:56:47 +01:00
Bond_009 6ebb00549b Add missing XmlTvListingsProvider 
Added from e679ac4224/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
 2018-12-30 17:42:54 +01:00
Bond_009 76d3f60f06 Fix NullRefException 2018-12-30 15:27:31 +01:00
Bond_009 69cf9e8fc4 Give more info on error 2018-12-30 13:18:38 +01:00
Joshua M. Boniface 76b647e0a8 Merge pull request #325 from jellyfin/dev 
Master 3.5.2-5
 2018-12-30 01:04:27 -05:00
Joshua M. Boniface d10d632c48 Merge pull request #323 from joshuaboniface/gitattributes 
Add merge=union for CONTRIBUTORS.md
 2018-12-30 00:46:29 -05:00
Joshua M. Boniface 9d91fa8ab8 Merge pull request #321 from EraYaN/fix-issue-320 
Fixed #320 by adding an extension method to BaseItem to make a deep copy of an object.
 2018-12-29 19:40:53 -05:00
Joshua M. Boniface 64a1a7560e Merge branch 'dev' into fix-issue-320 2018-12-29 19:39:05 -05:00
Joshua Boniface b306758836 Add merge=union for CONTRIBUTORS.md 2018-12-29 19:35:42 -05:00
Erwin de Haan ff88936f8b Update CONTRIBUTORS.md 2018-12-30 01:32:05 +01:00
Erwin de Haan 9c1c29325d Added extra extension method that create a new instance of the destination object. 2018-12-30 01:25:42 +01:00
Erwin de Haan de7fcaadb3 Fixed #320 by adding an extension method to BaseItem to make a deep copy of an object. 2018-12-30 01:12:33 +01:00
Joshua M. Boniface aac1007bdc Merge pull request #317 from Bond-009/csproj 
MediaBrowser.MediaEncoding use same layout/style as other csprojs
 2018-12-29 19:06:19 -05:00
Joshua M. Boniface 345c3e496a Merge pull request #313 from LogicalPhallacy/master 
Windows Install Scripts
 2018-12-29 18:42:05 -05:00
LogicalPhallacy 0c52f448a0 Rename installjellyfin.bat to install.bat 
and renaming the batch file
 2018-12-29 15:38:16 -08:00
LogicalPhallacy b3e0656ab2 Rename Build-JellyFin.ps1 to build-jellyfin.ps1 
renaming from webui commit because filesystem being stubborn.
 2018-12-29 15:35:20 -08:00
Bond_009 b0ca979bed MediaBrowser.MediaEncoding use same layout/style as other csprojs 2018-12-29 23:57:22 +01:00
Vasily 6e5d31bbec Merge pull request #316 from bfayers/replace-all-wiki-links 
Change every link to emby wiki to ones kept in web archive.
 2018-12-30 00:56:28 +03:00
bfayers 681dd2686b add myself to contributors 2018-12-29 21:33:47 +00:00
Joshua M. Boniface 77a15fe404 Merge pull request #314 from Bond-009/fix303 
Fixes possible NullReferenceException
 2018-12-29 15:25:10 -05:00
Bond_009 ab8df3741d Fixes possible NullReferenceException 2018-12-29 17:26:36 +01:00
Phallacy e222c2deb1 fixed installer custom library path 2018-12-29 08:08:35 -08:00
Phallacy b4be09898c added back win install scripts2 2018-12-29 07:30:12 -08:00
Phallacy 6f8cd361e1 added back win install scripts 2018-12-29 07:29:51 -08:00
Joshua M. Boniface 7889c9d355 Merge pull request #305 from flemse/show-wan-ip 
Re-adds wan ip on dashboard
 2018-12-28 23:25:05 -05:00
Anthony Lavado 61db95f7af Merge pull request #304 from joshuaboniface/file-header 
Add new file header to use as a base for new files
 2018-12-28 22:32:30 -05:00
Flemming Thesbjerg a91a28c408 re-adds wan ip on dashboard by requesting it from http://ipv4.icanhazip.com 2018-12-29 01:48:31 +01:00
Joshua M. Boniface bc6e876849 Add a better wording here 2018-12-28 19:29:07 -05:00
Joshua Boniface 6455623b4a Add new file header to use as a base for new files 2018-12-28 19:17:32 -05:00
Joshua M. Boniface 1f0b83c66a Merge pull request #301 from nvllsvm/fix-default-language 
Fix default language
 2018-12-28 17:15:21 -05:00
Andrew Rabert 4929ee9ab6 Fix default language 
The default preferred language in the startup wizard now defaults to
English (United States).
 2018-12-28 17:06:45 -05:00
Andrew Rabert 9c49e936f0 Merge pull request #288 from Bond-009/toarray 
Remove custom ToArray extension
 2018-12-28 16:33:42 -05:00
Vasily dc4a6026a5 Merge pull request #299 from nvllsvm/rmcoc 
Remove code of conduct
 2018-12-29 00:29:53 +03:00
Andrew Rabert b29aaed307 Remove CoC 2018-12-28 16:27:05 -05:00
Joshua M. Boniface 5ed0504cfb Merge pull request #298 from nvllsvm/disable_plugin_updates 
Disable plugin updates
 2018-12-28 16:16:59 -05:00