Commit graph

592 commits

Author SHA1 Message Date
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
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
gion 8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
Patrick Barron 032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009 3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009 04f826e50c Fix merge errors 2020-05-02 01:09:35 +02:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00