Joshua M. Boniface
|
67cfd43c67
|
Merge pull request #343 from Bond-009/patch-1
Fix location log dir when failed to read configuration
|
2018-12-31 11:27:27 -05:00 |
|
Bond-009
|
7d0ae2bca2
|
Fix location log dir when failed to read configuration
|
2018-12-31 15:34:27 +01:00 |
|
Joshua M. Boniface
|
b27ad9af0b
|
Merge pull request #336 from Bond-009/logconfig
Change location of logging.json
|
2018-12-30 17:34:41 -05:00 |
|
Bond_009
|
cd251799a4
|
Change location of logging.json
from <appdata> to <appdata>/config
|
2018-12-30 23:31:19 +01:00 |
|
Joshua M. Boniface
|
1f02cf4b7e
|
Merge pull request #285 from Bond-009/logging
Use Serilog to handle logging
|
2018-12-30 17:29:02 -05:00 |
|
Andrew Rabert
|
7ad0231430
|
Merge pull request #332 from bfayers/replace-embymedia-with-jellyfinmedia
Replace all emby.media links with jellyfin.media links
|
2018-12-30 17:20:15 -05:00 |
|
Bond_009
|
4c95aee52e
|
Fix logging in XmlTvListingsProvider
|
2018-12-30 22:49:09 +01:00 |
|
Bond_009
|
bbe2ca412b
|
Fix build error
|
2018-12-30 22:44:39 +01:00 |
|
Bond_009
|
88aa5da354
|
Fix build due to rebase
|
2018-12-30 22:44:39 +01:00 |
|
Bond_009
|
b1ccd6bad9
|
Fix build post GPL change
|
2018-12-30 22:44:39 +01:00 |
|
Bond_009
|
79d18cf5a5
|
Clean up some catch statements
|
2018-12-30 22:44:39 +01:00 |
|
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 |
|
bfayers
|
9986a3d22c
|
Go back to an emby.media/community link but via web archive
|
2018-12-30 21:18:48 +00:00 |
|
bfayers
|
0584700a76
|
Write out explanation rather than linking to a community (TMDB uppercasing)
|
2018-12-30 21:08:54 +00:00 |
|
bfayers
|
00ef953b8e
|
replace all instanced of emby.media with jellyfin.media
|
2018-12-30 20:48:08 +00: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 |
|