Commit Graph

797 Commits

Author SHA1 Message Date
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
Greenback
d6b0a939f7 fixed 2020-11-20 14:14:00 +00:00
Greenback
32b92641fb Get version info the manifest. 2020-11-20 14:03:27 +00:00
Joshua M. Boniface
b5ff91c281
Merge pull request #4298 from crobibero/bye-tvdb
Remove TheTVDB plugin from server source.
2020-11-19 14:25:12 -05:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Odd Stråbø
f8dd50fc1a Fix plugin old version cleanup 2020-11-19 15:50:34 +01:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
crobibero
4b15284324 Merge remote-tracking branch 'upstream/master' into bye-tvdb 2020-11-15 13:12:43 -07:00
Claus Vium
7caf1662ec
Merge pull request #4478 from Bond-009/chararray
Don't allocate single char arrays when possible
2020-11-15 13:48:43 +01:00
Bond-009
331c7f8481
Merge pull request #4253 from BaronGreenback/fordiscussion
DI in plugins
2020-11-15 13:29:04 +01:00
Bond_009
bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
crobibero
5845bf93cb Fix plugin update exception 2020-11-13 14:52:22 -07:00
crobibero
7ff212576e Merge remote-tracking branch 'upstream/master' into bye-tvdb 2020-11-11 08:08:06 -07:00
BaronGreenback
11a5353810
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-09 11:25:16 +00:00
BaronGreenback
e340e755f2
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-09 11:25:05 +00:00
BaronGreenback
f63a706a86
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-09 11:23:52 +00:00
Claus Vium
3900976be5
Merge pull request #4247 from crobibero/update-plugin
Update all on-disk plugins
2020-11-08 18:00:49 +01:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
Anthony Lavado
6205fb4b6a
Merge pull request #4341 from Bond-009/minor6
Minor improvements
2020-11-02 11:10:39 -05:00
BaronGreenback
0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
BaronGreenback
2c5609b333
Merge branch 'master' into fordiscussion 2020-10-26 13:19:13 +00:00
Bond_009
51dd3f1e19 Minor improvements 2020-10-17 16:01:36 +02:00
BaronGreenback
38da2ee26e
Merge branch 'master' into update-plugin 2020-10-17 09:47:20 +01:00
Joshua M. Boniface
f9bd7be741
Merge pull request #4285 from cvium/fix_websocketlisteners
Fix IWebSocketListener service registration
2020-10-17 01:58:35 -04:00
BaronGreenback
5b8349b442
Merge branch 'master' into fordiscussion 2020-10-14 19:05:57 +01:00
dkanada
42fb04b084
Merge pull request #4254 from BaronGreenback/PluginConfigFix
Fix for #4241: Plugin config initialisation.
2020-10-13 12:19:42 +09:00
BaronGreenback
63e514e6c4
Update ApplicationHost.cs 2020-10-12 20:34:18 +01:00
BaronGreenback
16a0357617
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-10-11 23:51:56 +01:00
BaronGreenback
5c8015128f
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-10-11 23:51:03 +01:00
BaronGreenback
d49ba96123
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-10-11 23:50:48 +01:00
Greenback
0b73a1d90f Added extra functionality to support registrar. 2020-10-11 13:19:14 +01:00
Greenback
1ee1f9c8a7 Fixed web interface. 2020-10-10 15:27:02 +01:00
Greenback
b34d6fec3d fixed tests 2020-10-10 14:08:26 +01:00
Greenback
6dc81ec8e8 Changes to support network config 2020-10-10 14:05:19 +01:00
crobibero
3119acd502 Remove tvdb plugin from server. 2020-10-09 07:43:02 -06:00
Greenback
ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Greenback
deb4d27857 Moved all settings across to network.xml 2020-10-08 19:00:55 +01:00
cvium
137baab0ac Remove websocketmanager from ApplicationHost 2020-10-06 20:19:36 +02:00
Jim Cartlidge
53af1e3455 Updatig netcollection & re-inserting BOM 2020-10-04 09:56:33 +01:00
cvium
e9524f89d6 Migrate the TMDb providers to the TMDbLib library 2020-10-03 19:53:07 +02:00
BaronGreenback
7459baac8b
Update ApplicationHost.cs 2020-10-03 09:23:12 +01:00
BaronGreenback
2929ce6e0d
Update ApplicationHost.cs 2020-10-03 09:18:00 +01:00
BaronGreenback
298a322ac1
Update ApplicationHost.cs 2020-10-03 09:13:04 +01:00
BaronGreenback
ba685d8092
Update ApplicationHost.cs 2020-10-03 09:08:28 +01:00
BaronGreenback
d91a4f0c6d
Update ApplicationHost.cs 2020-10-01 20:25:40 +01:00
BaronGreenback
0738a2dc4b
Update ApplicationHost.cs 2020-10-01 19:22:58 +01:00
BaronGreenback
ee40f21049
Update ApplicationHost.cs 2020-10-01 18:59:46 +01:00
crobibero
53d8023def Update all on-disk plugins 2020-09-30 17:37:30 -06:00
Jim Cartlidge
3b64171cde Minor change to get it to compile. 2020-09-30 18:02:36 +01:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
BaronGreenback
92b63db569
Update ApplicationHost.cs 2020-09-17 15:57:11 +01:00
BaronGreenback
826148dc84
Added versioning to files without meta.json 2020-09-17 11:01:46 +01:00
Joshua M. Boniface
bc5404cd6f
Merge pull request #3401 from BaronGreenback/Plugins
Fix for windows plug-in upgrades issue: #1623
2020-09-16 17:22:58 -04:00
BaronGreenback
a2c50e8005
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
2020-09-14 21:02:13 +01:00
BaronGreenback
5baf87663f
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
2020-09-14 20:57:49 +01:00
BaronGreenback
02951bb8ce
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
2020-09-14 20:57:00 +01:00
BaronGreenback
69c4b44d24
Update ApplicationHost.cs 2020-09-14 20:52:18 +01:00
BaronGreenback
51c416c832
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-14 20:23:35 +01:00
BaronGreenback
e88d3ba8c2
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-14 18:44:29 +01:00
BaronGreenback
f80e181eda
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-14 18:44:17 +01:00
Jim Cartlidge
d27d2a8990 Renamed file. 2020-09-14 18:23:50 +01:00
BaronGreenback
68d08e94fd
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-14 16:18:39 +01:00
Jim Cartlidge
b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
BaronGreenback
7b4b101eca
Update ApplicationHost.cs 2020-09-13 18:06:13 +01:00
BaronGreenback
107d606a70
Update ApplicationHost.cs 2020-09-13 17:51:14 +01:00
BaronGreenback
6c2c2cb872
Update ApplicationHost.cs
Global jsonserializer added
2020-09-13 17:45:17 +01:00
BaronGreenback
12fb827405
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-13 17:29:10 +01:00
BaronGreenback
008aa51eb7
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-13 17:24:30 +01:00
BaronGreenback
b4edb7c90d
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-13 17:24:02 +01:00
Jim Cartlidge
5f58d2c151 With method comments. 2020-09-13 16:37:20 +01:00
Jim Cartlidge
81f655803d Modified to work with manifests. 2020-09-13 16:30:04 +01:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
BaronGreenback
60e8f47194
Update ApplicationHost.cs 2020-09-08 17:52:08 +01:00
BaronGreenback
a9d8b53658
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-08 17:49:55 +01:00
BaronGreenback
2eff0db804
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-08 17:49:38 +01:00
crobibero
a2e90170da Use existing configuration manager 2020-09-07 14:21:30 -06:00
crobibero
7de0fcfc94 Merge remote-tracking branch 'upstream/master' into startup-complete 2020-09-07 14:07:15 -06:00
BaronGreenback
cf87b3afb7 Remove excess code. 2020-09-07 12:28:48 +01:00
crobibero
26c432b564 Rename StartupCompleted to StartupWizardCompleted 2020-09-06 14:27:31 -06:00
crobibero
db9bcdcdc9 Use proper StartupCompleted flag 2020-09-05 18:48:19 -06:00
BaronGreenback
0f6ea123ea
Update ApplicationHost.cs 2020-09-05 20:55:42 +01:00
BaronGreenback
8439860b2a
Merge branch 'master' into Plugins 2020-09-05 20:49:04 +01:00
BaronGreenback
e33824d286
Changed to named tuples 2020-09-05 20:20:15 +01:00
crobibero
9a74ace84b Add flag for startup completed 2020-09-05 09:20:58 -06:00
crobibero
2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
Joshua M. Boniface
52aea85e7f
Merge pull request #4031 from Bond-009/warn28
Fix some warnings
2020-09-03 14:40:29 -04:00
crobibero
fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00
crobibero
d8a0edc511 Revert "Remove ResponseHeadersRead where applicable"
This reverts commit 85844a84b6.
2020-09-03 07:20:33 -06:00
crobibero
85844a84b6 Remove ResponseHeadersRead where applicable 2020-09-03 06:48:19 -06:00
Claus Vium
2f79c3095b Fix startup message 2020-09-03 11:54:38 +02:00
Claus Vium
571d0570f5 Kill HttpListenerHost 2020-09-03 11:32:22 +02:00
Claus Vium
5813f8073c Move HttpListenerHost middleware up the pipeline 2020-09-03 00:32:56 +02:00
Claus Vium
e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero
4038d15c83 Properly migrate all HttpCompletionOption 2020-09-01 07:51:06 -06:00
Bond-009
8ee042483a
Merge pull request #2888 from ConfusedPolarBear/quickconnect
Add quick connect (login without typing password)
2020-08-31 23:01:27 +02:00
Bond_009
e653eef44f Fix some warnings 2020-08-31 22:20:19 +02:00
crobibero
f498e1ee59 remove IHttpClient 🎉 2020-08-31 12:10:49 -06:00
crobibero
6d19adbecf migrate to IHttpClientFactory in ApplicationHost 2020-08-31 11:36:29 -06:00
Bond-009
95142643f6
Merge pull request #3871 from Ullmie02/plugins-api
Allow plugins to define their own api endpoints
2020-08-31 18:28:11 +02:00
David Ullmer
b37cc7bfaf Don't evaluate twice 2020-08-31 18:03:13 +02:00
David Ullmer
7f79f2ee0e Use .Distinct on assembly 2020-08-31 17:53:55 +02:00
Matt Montgomery
df0d197dc8 Apply suggestions from code review 2020-08-26 15:24:24 -05:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Patrick Barron
a77cf53573 Allow plugins to register services. 2020-08-16 17:25:14 -04:00
David
025ee2163f Change log message, load assembly only once 2020-08-14 20:42:26 +02:00
Matt Montgomery
4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
David
d296a1f6d0 Add logging, cleanup 2020-08-12 14:00:48 +02:00
David
9e95fe8f9d Add plugin assemblies to mvc builder 2020-08-11 18:20:16 +02:00
crobibero
460c3dd351 convert dependent controller functions to di helper class 2020-08-09 17:20:14 -06:00
crobibero
dee7bdddb6 fix build 2020-08-03 14:49:24 -06:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Joshua M. Boniface
22cc602117
Merge pull request #3366 from barronpm/remove-usermanager-addparts
Remove UserManager.AddParts
2020-07-23 18:05:57 -04:00
Patrick Barron
200f369596 Use interfaces in app host constructors 2020-07-22 19:34:14 -04:00
David
5580df38e6 Cleanup after merge 2020-07-22 11:05:41 +02:00
David
90039e1ad3 Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs
2020-07-22 11:02:44 +02:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02:00
Patrick Barron
ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
Patrick Barron
303c175714 Fix circular dependency 2020-07-13 17:25:50 -04:00
Patrick Barron
3b085f6a03 Remove UserManager.AddParts 2020-07-13 17:25:50 -04:00
Anthony Lavado
3d3e66c5d1
Merge pull request #3513 from barronpm/plugin-exception-fix
Fix TypeLoadException during plugin load
2020-07-05 13:55:24 -07:00
Patrick Barron
942c733d4f Fix TypeLoadException during plugin load 2020-07-05 15:38:35 -04:00
Bond_009
ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00
Neil Burrows
4748df26b6 Remove un-needed comment 2020-06-29 17:25:12 +01:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
BaronGreenback
ba3a9f7d46 removing stray < character from description. 2020-06-22 12:14:31 +01:00
BaronGreenback
a25a233b75 Using Version class. 2020-06-22 11:57:46 +01:00
BaronGreenback
bf1bbbdd3e Changed sorting to case insensitive 2020-06-21 18:46:48 +01:00
BaronGreenback
2255bc9872 Changed padding in version numbers based up how they are stored in the repository. 2020-06-21 18:42:50 +01:00
BaronGreenback
d89c46f1a9 fixes 2020-06-21 17:11:21 +01:00
BaronGreenback
99410f3c97 fixes 2020-06-21 16:15:55 +01:00
BaronGreenback
a041fe8a2d Add versioning to plugin folders 2020-06-21 13:29:35 +01:00
Cody Robibero
43221fc26b
Merge branch 'master' into SSDP 2020-06-20 15:33:13 -06:00
David
64fb173dad Move DashboardController to Jellyfin.Api 2020-06-20 15:59:41 +02:00
ConfusedPolarBear
e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
ConfusedPolarBear
7d9b552403
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-06-09 13:28:40 -05:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
gion
e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Patrick Barron
3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron
953777f1ba Removed unnecessary usings 2020-05-14 18:12:51 -04:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron
b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Vasily
f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
2020-05-13 20:36:54 +03:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron
62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Mark Monteiro
3abf870c1e Do not include a double slash in URLs when a base URL is not set 2020-05-10 18:07:56 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
Mark Monteiro
43c22a5822 Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
2020-05-10 14:36:11 -04:00