Commit Graph

657 Commits

Author SHA1 Message Date
Joshua M. Boniface
3c46f10e3d
Merge pull request #5315 from BaronGreenback/FixFor5280Part2 2021-03-08 18:06:40 -05:00
BaronGreenback
d3390302f9
Update ApplicationHost.cs 2021-03-08 11:43:59 +00:00
Bond-009
c2af32d035
Merge pull request #5299 from Bond-009/tests13 2021-03-01 18:51:09 +01:00
BaronGreenback
159ecb882f Fixed bad sync 2021-02-28 10:14:05 +00:00
BaronGreenback
80ca3da55c Merge remote-tracking branch 'upstream/master' into FixFor5280Part2 2021-02-28 10:12:14 +00:00
BaronGreenback
1d6f489f17 comment change 2021-02-28 10:11:37 +00:00
BaronGreenback
f666b7e102 fix 2021-02-27 23:32:22 +00:00
Claus Vium
9e77fdc70d
Merge pull request #5312 from BaronGreenback/FixFor5280 2021-02-27 20:01:51 +01:00
BaronGreenback
73ca367bf9
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-02-27 17:34:48 +00:00
BaronGreenback
d95ca20fc7 removed bad merge code 2021-02-27 14:05:13 +00:00
BaronGreenback
a25e3c0256 fix for override ports contained in PublishedServerUrl 2021-02-27 13:56:21 +00:00
Bond_009
2bc1eef4dd Clean up code 2021-02-24 22:18:59 +01:00
Bond_009
032d72a8a7 Pls fix race condition 2021-02-23 17:30:24 +01:00
Bond_009
ed8fce2dce Use SubtitleEdit to parse subtitles 2021-02-09 15:12:41 +01:00
BaronGreenback
149c2b2169 Added referenced assembly failure detection, and DI failure protection. 2020-12-31 11:39:34 +00:00
crobibero
dbfbf9fb5b Fix bad merge 2020-12-30 19:45:31 -07:00
Cody Robibero
5c57569692
Merge branch 'master' into PluginDowngrade 2020-12-30 18:11:37 -07:00
David
3dec1fd6b2 Use UTF8 encoding and async correctly 2020-12-29 00:35:59 +01:00
David
043d045448 Put json serializer options in private field 2020-12-24 11:22:34 +01:00
David
e835dfb27d Use sync string instead of file 2020-12-24 10:31:51 +01:00
David
2a574914ea Use streams instead of strings 2020-12-23 19:24:58 +01:00
BaronGreenback
dae6798a18 Making it work 2020-12-23 17:25:41 +00:00
BaronGreenback
62702fa3eb Changes as requested 2020-12-23 16:28:50 +00:00
David
196388d607 Remove custom Json serializer from Emby.Server.Implementations 2020-12-23 13:14:40 +01:00
BaronGreenback
66d98cb8e4
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-12-23 10:24:30 +00:00
Greenback
486148dd6b Removed maxAbi 2020-12-18 09:44:57 +00:00
Greenback
5a3efc5266 Changes as required. 2020-12-18 09:04:40 +00:00
Greenback
eb2439f23b Changes as recommended. 2020-12-15 16:37:11 +00:00
Greenback
dddcfa6dbb Suggested changes. 2020-12-15 09:30:19 +00:00
BaronGreenback
67c480ad53
Merge branch 'master' into PluginDowngrade 2020-12-15 01:15:54 +00:00
Greenback
fbb20ebef6 Plugin setting migration to folders. 2020-12-15 00:42:59 +00:00
Greenback
494ace7984 Mark plugin failure on DI Loop. 2020-12-14 23:39:47 +00:00
Greenback
7986465cf7 Initial upload 2020-12-14 16:14:39 +00:00
Claus Vium
c5a5f77b9e
Merge pull request #4726 from BaronGreenback/19.0RC--Fix-CertificateLoadError
Fix - Access Denied on using certificates in windows as user.
2020-12-13 13:35:02 +01:00
Nyanmisaka
d701b67de1
Apply suggestions from code review
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-12-12 02:36:31 +08:00
nyanmisaka
41218c5613 fix ssl certificate cannot be saved 2020-12-11 23:52:09 +08:00
BaronGreenback
b485520537
Update ApplicationHost.cs
Added X509KeyStorageFlags.UserKeySet
2020-12-07 20:25:41 +00:00
Joshua M. Boniface
670f7cacc3
Merge pull request #4651 from crobibero/iso_manager
Remove IIsoMounter and IsoMounter
2020-12-04 14:53:09 -05:00
Claus Vium
dca3f62ff8
Merge branch 'master' into PlugsVersionNumberFix 2020-12-04 13:50:44 +01:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Nyanmisaka
d496fd2d48
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-03 21:34:25 +08:00
nyanmisaka
bbe872524d optimize load plugin logs 2020-12-03 20:12:41 +08:00
Bond_009
e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
BaronGreenback
6676ca4d1b
Remove ResourceFileManager (#4567) 2020-11-24 06:06:36 +01:00
Greenback
9b5ae690c1 renamed file. 2020-11-21 16:17:26 +00:00
Greenback
616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Greenback
eed1a40b19 Fixed tests 2020-11-20 19:18:18 +00:00
Greenback
972ed3ccfe fix. 2020-11-20 18:56:36 +00:00
BaronGreenback
b879fb615e
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-20 15:19:46 +00:00