michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,527 Commits 2 Branches 79 Tags 73 MiB
d0f49b3994
Commit Graph

513 Commits

Author SHA1 Message Date
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
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
Mark Monteiro
57b5ec1d51 Remove unnecessary properties from SystemInfo response object 
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
 2020-04-26 12:07:54 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
sparky8251
68c7a914c3 Added option to disable metrics collection and defaulted it to off 2020-04-26 11:28:17 -04:00
Mark Monteiro
bcf1ef319a Update documentation for EnableUPnP 2020-04-17 00:27:18 -04:00
Mark Monteiro
c78413cf7c Disable UPnP by default 2020-04-16 22:41:19 -04:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Mark Monteiro
387fa474aa Document HTTPS configuration options 2020-04-02 17:45:33 -04:00
Vasily
07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content 
Support Running Server Without Web Content
 2020-04-01 23:38:43 +03:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master 
Pull latest to my fork
 2020-03-19 22:02:08 -04:00
Mark Monteiro
e2685c51ec Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-15 18:07:02 +01:00
Mark Monteiro
99bf6edba2 Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-11 23:04:47 +01:00