Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
19352 commits 29 branches 75 tags 1.3 GiB
Commit graph

2459 commits

Author SHA1 Message Date
Jim Cartlidge fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
Jim Cartlidge bbe2400b59 Updating to NetCollection 1.03 2020-09-30 17:51:17 +01:00
Bond-009 c7b3d4a90c
Merge pull request #4164 from spooksbit/remove-browser-auto-load 
Removed browser auto-launch functionality
 2020-09-29 18:24:58 +02:00
Bond-009 cbf9be9416
Merge pull request #3577 from crobibero/package-install-repo 
Specify plugin repo on plugin installation
 2020-09-29 18:24:11 +02:00
Matt Montgomery 53d5f64e03 Fix SA1513, SA1514, SA1507, and SA1508 2020-09-28 15:04:31 -05:00
Niels van Velzen 72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
crobibero b7022e8dc1 Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-26 16:57:53 -06:00
Jim Cartlidge 5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado af24c43118
Merge pull request #4192 from nielsvanvelzen/generalcommand-sucks 
Use GeneralCommandType enum in GeneralCommand
 2020-09-23 09:57:45 -04:00
dkanada 028c681c15
Merge pull request #3928 from Mygod/patch-1 
Add 1440p to the mix
 2020-09-23 20:00:26 +09:00
Niels van Velzen 3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
spookbits 5cca8bffea Removed browser auto-load functionality from the server. 
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
 2020-09-16 13:22:04 -04:00
Jim Cartlidge 68de105dc2 Comments part 1 2020-09-13 13:49:11 +01:00
crobibero 46ae51bc9a update to dotnet 3.1.8 2020-09-12 10:19:04 -06:00
Jim Cartlidge 9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
cvium 78cab77f81 Add Known Proxies to system configuration 2020-09-10 11:05:46 +02:00
Anthony Lavado d08ddbb8d2
Merge pull request #4013 from crobibero/dynamic-cors 
Allow CORS domains to be configured
 2020-09-07 19:41:45 -04:00
crobibero 7de0fcfc94 Merge remote-tracking branch 'upstream/master' into startup-complete 2020-09-07 14:07:15 -06:00
BaronGreenback eedb520af1 Removed code that wasn't used. 2020-09-07 12:14:02 +01:00
crobibero 26c432b564 Rename StartupCompleted to StartupWizardCompleted 2020-09-06 14:27:31 -06:00
crobibero 9a74ace84b Add flag for startup completed 2020-09-05 09:20:58 -06:00
crobibero 8a08111adc Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-05 09:00:55 -06:00
Bill Thornton b065f5db1d Fix aac mime-type 2020-09-04 17:41:31 -04:00
Joshua M. Boniface 376e4793e6
Merge pull request #4035 from crobibero/api-doc-base-url 
Fix apidoc routes with base url
 2020-09-04 10:30:13 -04:00
crobibero 21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06:00
Nyanmisaka 4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Joshua M. Boniface 52aea85e7f
Merge pull request #4031 from Bond-009/warn28 
Fix some warnings
 2020-09-03 14:40:29 -04:00
Bond-009 9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements 
Deinterlacing improvements
 2020-09-03 20:38:54 +02:00
Bond-009 42f22a8e55
Merge pull request #3976 from nyanmisaka/muxer 
Expose max_muxing_queue_size to user
 2020-09-03 20:36:17 +02:00
crobibero 5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
crobibero 1de22af646 Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-03 07:48:34 -06:00
Bond-009 8c28824c88
Merge pull request #4042 from jellyfin/ci-packaging-fixes 
Fixes for CI Nuget package pushing and CI triggers
 2020-09-03 12:56:04 +02:00
Erwin de Haan 346581bb2a Fixes for CI Nuget package pushing and CI triggers 
Also adds SourceLink support and symbols that are pushed to Nuget.
Add symbols to main nuget packages for unstable builds (Azure Artifacts does not support symbols outside of the main package)
SourceLink will enable stepping during debugging.
 2020-09-02 22:42:00 +02:00
crobibero 1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
Claus Vium e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero 65d05f92ac Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-01 18:27:55 -06:00
crobibero f443c534bf Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-01 18:24:42 -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 bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
crobibero 3c0484cc97 Allow for dynamic cors response 2020-08-30 09:32:14 -06:00
crobibero ec8967b8e6 Fix partial library and channel access 2020-08-27 10:00:06 -06:00
Bond-009 4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease 
Use Prerelease System.Text.Json
 2020-08-26 18:59:46 +02:00
Matt Montgomery 2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
crobibero b02650ec2f use proper spdx 2020-08-26 07:39:01 -06:00
crobibero 5f60da29c7 switch to spdx 2020-08-26 07:36:57 -06:00
crobibero 670c41ee89 Properly pack project license 2020-08-25 21:33:19 -06:00
crobibero 582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
Joshua M. Boniface e83f6d6ec7
Merge pull request #3889 from Ullmie02/nuget-versioning 
Build Unstable NuGet packages
 2020-08-25 17:08:06 -04:00
Joshua M. Boniface cf6ef9958d
Merge pull request #3910 from barronpm/event-rewrite-1 
Event Rewrite (Part 1)
 2020-08-25 16:59:35 -04:00
crobibero 5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron fa8892fde4 Make LibraryController.GetDownload async 2020-08-24 20:27:10 -04:00
Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 2020-08-24 20:04:13 -04:00
nyanmisaka d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08:00
crobibero 9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero 07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
nyanmisaka dd3b48f203 fix lint 2020-08-20 15:17:42 +08:00
Patrick Barron 98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009 2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
nyanmisaka aa75755480 Merge remote-tracking branch 'upstream/master' into fonts 2020-08-19 16:56:53 +08:00
crobibero b43a8fb9d3 Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-08-18 20:20:32 -06:00
Mygod 8b9a380466
Add 1440p to the mix 
Partially addresses #3112.
 2020-08-18 01:24:24 -04:00
Matt Montgomery 5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
Patrick Barron ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron 3ee940f7b3 Clean up GenericEventArgs 2020-08-13 19:14:03 -04:00
Patrick Barron 27139709e5 Remove ListHelper.cs 2020-08-13 17:05:55 -04:00
David b92fbe4d69 Use VersionPrefix 2020-08-13 19:03:24 +02:00
David a61f6e3308 Fix nuget ci 2020-08-13 15:22:12 +02:00
crobibero 6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
Matt Montgomery 4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
Orry Verducci 2d6699fd47 Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:17:13 +01:00
Orry Verducci 7df2affb23 Add double rate deinterlacing option 2020-08-10 22:14:47 +01:00
Bond_009 593dbcabff Fix docs 2020-08-09 14:08:56 +02:00
Bond_009 4a4dff1973 Fix 2020-08-09 14:08:56 +02:00
crobibero e65ecb5687 Merge remote-tracking branch 'upstream/master' into api-merge-again 2020-08-04 20:29:06 -06:00
Bond_009 2b355c36ff Minor improvements 
OFC I reduced some allocations
 2020-08-03 20:32:45 +02:00
crobibero f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Nyanmisaka c23d991c95
Merge branch 'master' into tonemap 2020-08-03 14:58:44 +08:00
Bond-009 b7421db5fe
Merge pull request #3578 from barronpm/displaypreferences-efcore 
Migrate Display Preferences to EF Core
 2020-08-01 21:51:49 +02:00
nyanmisaka 45a97056ea allows to provide multiple fonts 2020-07-29 02:44:11 +08:00
Matt Montgomery a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
nyanmisaka 7b862bba5a add Tonemapping relaying on nvdec and ocl 2020-07-25 00:57:34 +08:00
nyanmisaka c888b34a62 add a method to use custom fallback fonts for subtitle rendering 2020-07-24 21:19:56 +08:00
Patrick Barron a59bc5c6a8 Fixed compilation error. 2020-07-23 20:57:59 -04:00
Patrick Barron 3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Pika 7331c02a21
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:22:56 -04:00
Pika ea4aa5ed8e
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:19 -04:00
Pika 262daa6650
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:02 -04:00
Pika f5a3408c89
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:12:52 -04:00
Pika 3b21abd879
Merge branch 'master' into more-track-titles 2020-07-23 18:59:25 -04:00
Bond-009 ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix 
Fix value parsing in Jellyfin.Api
 2020-07-23 10:37:30 +02:00
Bond-009 944fdb4c62
Merge pull request #3552 from BaronGreenback/NotificationFix 
Fixes #3551 (Notifications Serialization error)
 2020-07-23 10:34:32 +02:00
crobibero 1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Patrick Barron 4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
Patrick Barron ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
BaronGreenback 6b4cea604c Suggested changes and removed some intellisense messages. 2020-07-17 16:19:06 +01:00
crobibero 2b5d515de7 specify plugin repo on install 2020-07-17 09:08:29 -06:00
David 262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
BaronGreenback 12478c7196
Update NotificationOption.cs 
Fixes serialisation bug
 2020-07-13 17:54:06 +01:00
dkanada 5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
David ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02:00
Joshua M. Boniface f3151e7dc7
Merge pull request #3505 from Bond-009/minor3 
Minor fixes
 2020-07-05 00:30:35 -04:00
Bond_009 ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00
Patrick Barron 6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
Bond-009 89ef8d79d6
Merge pull request #3465 from BaronGreenback/BugFix2 
10.6.0.0 Null Pointer fix
 2020-06-27 20:43:37 +02:00
BaronGreenback 2f4860741c _config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer. 2020-06-27 15:41:57 +01:00
dkanada 9a44e2912e
Merge pull request #3455 from jellyfin/values 
Use constructor to set optimal config values
 2020-06-27 05:58:07 +09:00
dkanada 83ae4d074d use constructor to set optimal config values 2020-06-27 00:22:27 +09:00
Cody Robibero 5f1b1dc3cc
fix nullability 2020-06-26 08:41:21 -06:00
Mark Monteiro 0e9164351b Merge remote-tracking branch 'upstream/master' into external-id-type 2020-06-26 10:12:22 -04:00
dkanada 4e08876028
Merge pull request #3418 from Bond-009/minor3 
Minor changes
 2020-06-23 16:56:44 +09:00
Bond-009 3d42f37538 Minor changes 2020-06-22 15:35:53 +02:00
Bond-009 464066f362
Merge pull request #3411 from neilsb/system-plugin-removal 
Prevent system plugins from being uninstalled
 2020-06-22 15:23:35 +02:00
dkanada 552a358c9c
Merge pull request #3244 from jellyfin/custom-repos 
Initial implementation for custom plugin repositories
 2020-06-22 22:08:43 +09:00
Neil Burrows c20400fa40 Prevent system plugins from being uninstalled 2020-06-22 10:13:28 +01:00
telans 5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
telans 7f307f9082
brace multiline if statements 2020-06-20 21:12:36 +12:00
telans 98db8f72e0
fix SA1503 for one line if statements 2020-06-20 20:35:29 +12:00
telans 8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
ConfusedPolarBear e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
ConfusedPolarBear 329980c727 API cleanup 2020-06-19 23:33:07 -05:00
ConfusedPolarBear 4be476ec53 Move all settings into the main server configuration 
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
 2020-06-19 23:32:24 -05:00
crobibero 0651d7512b Enable BlurHash for People 2020-06-16 15:12:48 -06:00
dkanada f5d82441a4
Merge branch 'master' into custom-repos 2020-06-17 02:09:32 +09:00
Bond-009 9af6eda0b4
Merge pull request #3343 from telans/comment-stops 
Add full stop at end of comments (SA1629)
 2020-06-16 11:54:58 +02:00
telans 247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans 9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
dkanada dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
telans 9b528aabc2
misc 2020-06-15 10:45:59 +12:00
telans 3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans acd4389653
fix SA1005 2020-06-15 10:41:00 +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
Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore 
# Conflicts:
#	MediaBrowser.Controller/Library/ILibraryManager.cs
#	MediaBrowser.Providers/Users/UserMetadataService.cs
 2020-06-11 18:23:12 -04:00
crobibero a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
aled 299e49f39d Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
ConfusedPolarBear 0d6a63bf84 Make all properties nullable 2020-06-08 15:48:18 -05:00
ConfusedPolarBear 35ff2be9d7 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-08 14:43:58 -05:00
artiume b79957d07e Split HEVC VP9 10bit 2020-06-08 14:45:27 +03:00
Vasily 4999831604 Merge remote-tracking branch 'upstream/master' into hwaccel 2020-06-08 14:44:21 +03:00
dkanada 3f58bd7c58 disable nullable errors for new model 2020-06-07 21:26:50 +09:00
dkanada 52cd955a8f merge branch master into custom-repos 2020-06-07 21:23:15 +09:00
aled 22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
dkanada 8ac2f1bb8b simplify the custom repository feature for now 2020-06-06 22:02:30 +09:00
dkanada d6184dbadd remove unnecessary property for repository object 2020-06-06 18:57:00 +09:00
dkanada 6d4f3c42a2
Merge pull request #3208 from jellyfin/plugins 
More work for core plugins
 2020-06-06 12:27:45 +09:00
Patrick Barron fa80f84f26 Merge branch 'userdb-efcore' of https://github.com/barronpm/jellyfin into userdb-efcore 2020-06-05 22:33:34 -04:00
crobibero 340624c54b Move default repo addition to migration 2020-06-05 13:23:38 -06:00
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
 2020-06-04 16:52:23 -04:00
dkanada b7f4b8e2b5 initial implementation for custom plugin repositories 2020-06-04 23:57:57 +09:00
dkanada fe16c3fad4
Merge branch 'master' into install-plugin 2020-06-04 03:20:48 +09:00