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

524 commits

Author SHA1 Message Date
crobibero 21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06: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 1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
nyanmisaka d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08: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
Matt Montgomery a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05: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
crobibero 1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
David 262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
David ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02: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 83ae4d074d use constructor to set optimal config values 2020-06-27 00:22:27 +09:00
Bond-009 3d42f37538 Minor changes 2020-06-22 15:35:53 +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
telans 5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
ConfusedPolarBear e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -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
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
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
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 52cd955a8f merge branch master into custom-repos 2020-06-07 21:23:15 +09:00
dkanada 6d4f3c42a2
Merge pull request #3208 from jellyfin/plugins 
More work for core plugins
 2020-06-06 12:27:45 +09: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
Vasily 668e10ceb7
Merge pull request #2767 from Bond-009/nullable3 
Enable nullabe reference types for MediaBrowser.Model
 2020-06-03 12:26:54 +03:00
Anthony Lavado c31b2798a5
Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
dkanada d72bb8358e minor changes to server configuration file 2020-05-31 15:20:17 +09:00
Bond_009 7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
Patrick Barron 7c823464bc Fix merge conflicts with SyncPlay 2020-05-26 20:52:05 -04: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
nyanmisaka b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
gion e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
xumix 46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03: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 b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Mark Monteiro dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
gion 8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion 459297211e Implement syncplay permissions for a user 2020-04-27 22:09:02 +02:00