alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-07 00:08:29 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
19,699 Commits 20 Branches 108 Tags
0f4bbbc63cf2d4f79301a0be7a5431ea5b8cdbb7
Commit Graph

2488 Commits

Author SHA1 Message Date
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
Bond-009
2dbb9d4895 Fix build 2020-06-03 11:54:01 +02: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
Vasily
959a9655c8 Update MediaBrowser.Model/Services/IHasRequestFilter.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-06-03 12:26:40 +03:00
Anthony Lavado
c31b2798a5 Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
Patrick Barron
bb828d54c5 Remove unused methods 2020-06-02 14:40:48 -04:00
Vasily
b9618c8c01 Merge pull request #2676 from GranPC/public-pr/blurhash 
Implement Blurhash generation for images
 2020-06-02 17:25:45 +03:00
dkanada
d72bb8358e minor changes to server configuration file 2020-05-31 15:20:17 +09:00
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Bond_009
7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
ferferga
ba03ed65fe Remove "download images in advance" option 2020-05-27 19:13:41 +02:00
Vasily
2482bcb3b1 Add blurhashes to ImageBlurHashes for all images 2020-05-27 16:27:27 +03: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
Joshua M. Boniface
7c72f69189 Merge pull request #2733 from OancaAndrei/syncplay 
Add syncplay feature
 2020-05-26 20:00:01 -04:00
Joshua M. Boniface
0be3dfe7c5 Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -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
Vasily
0f32b0ffad Change image blurhash mapping to "image type to blurhash" 2020-05-26 01:04:40 +03:00
xumix
46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Vasily
279f0da980 Rename ImageInfo.Hash to ImageInfo.BlurHash 2020-05-26 00:52:13 +03:00
Vasily
29443e3681 Apply suggestions from code review 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-05-26 00:50:29 +03:00