lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,560 Commits 2 Branches 0 Tags 64 MiB
a44309f56f
Commit Graph

3071 Commits

Author SHA1 Message Date
Mark Monteiro
422d5b2b68 Move ExternalIdMediaType enum to MediaBrowser.Model 2020-05-17 15:57:24 -04:00
Mark Monteiro
e5c857ac36 Rename external id type 'None' to 'General' 2020-05-17 15:29:53 -04:00
Mark Monteiro
526e47c362 Clean up documentation 2020-05-17 15:27:43 -04:00
Mark Monteiro
96acd6481e Merge branch 'master' into externalid-type 2020-05-17 13:50:44 -04:00
Mark Monteiro
3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -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
Vasily
d21feb2b18
Merge pull request #2970 from barronpm/activitydb-efcore 
Migrate Activity Database to Entity Framework Core
 2020-05-15 22:04:23 +03:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Frank Riley
9ee10d22c8 Rename function 2020-05-14 16:15:09 -07:00
Frank Riley
3cb6fd8a27 Fix #3083: Set the Access-Control-Allow-Origin header to the request origin/host header if possible 2020-05-14 16:15:03 -07:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
1fecd55ac0 Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore 2020-05-13 15:35:44 -04:00
Patrick Barron
1e9b2613c6 Remove more unused code 2020-05-13 15:35:14 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Mark Monteiro
51cdb30741
Apply documentation suggestions from code review 
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
 2020-05-13 09:46:29 -04:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron
c1360a1dc3 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
 2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -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
5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00
gion
8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion
6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00
Bond-009
62da4d0e5c
Merge pull request #2492 from Polpetta/fix-api-private-data-leak 
Fix emby/user/public API leaking sensitive data
 2020-05-07 14:52:10 +02:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Vasily
8607b6a997
Merge pull request #2817 from ferferga/master 
Remove unnecessary space in hardware decoders argument for ffmpeg
 2020-04-29 02:37:24 +03:00
gion
083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion
aad5058d25 Implement KeepAlive for WebSockets 2020-04-27 22:39:37 +02:00
gion
84d92ba9ce Check that client is playing the right item 
Send date when playback command is emitted
Rename some classes
 2020-04-27 22:39:20 +02:00
gion
f273995f5b Refactor: rename user to session 2020-04-27 22:07:33 +02:00
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
Mark Monteiro
679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
 2020-04-26 17:37:30 -04:00
Joshua M. Boniface
00d8983d7c
Merge pull request #2990 from mark-monteiro/create-missing-folders 
Create Missing Data Folders
 2020-04-26 16:02:09 -04:00
Mark Monteiro
7615cdc963 Ensure metadata path is created on app startup, and also each time it is updated 2020-04-26 15:51:41 -04:00
Joshua M. Boniface
f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again 
Make localhost LiveTV restreams always use plain HTTP port
 2020-04-26 15:13:27 -04:00
Joshua M. Boniface
cbeeeced75
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:43 -04:00
Joshua M. Boniface
6ac723706c
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:34 -04:00
Joshua M. Boniface
0157326354
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:00 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
dkanada
97d7ffc458
Merge pull request #2861 from mark-monteiro/fix-auth-response-codes 
Fix Auth Response Codes
 2020-04-23 14:10:22 +09:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00
Bond-009
07326c1d9b
Merge branch 'master' into fix-auth-response-codes 2020-04-22 13:16:08 +02:00
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure 
Remove requirement to build web during server builds
 2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files 
This is required for SonarCloud analysis to run
 2020-04-21 16:21:09 -04:00
Mark Monteiro
f815059698 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-20 20:11:33 -04:00
Anthony Lavado
ed1dc5c922 Remove JsonIgnore from the DateLastSaved property of BaseItem 2020-04-20 02:35:47 -04:00
dkanada
3142c9b990
Merge pull request #2916 from Bond-009/minor2 
Minor improvements
 2020-04-20 13:52:27 +09:00
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19 
Fix some warnings
 2020-04-19 12:04:02 +09:00
Mark Monteiro
ecf49caf0d Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Mark Monteiro
00a0e013c6 Update documentation for URL methods in ApplicationHost 2020-04-16 21:46:49 -04:00
Mark Monteiro
fee76097f4 Remove CanConnectWithHttps Property 
It is only used in one place and only adds confusion by existing
 2020-04-16 21:45:00 -04:00
Mark Monteiro
daed41815f
Add missing punctuation in xml comment 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-15 08:56:00 -04:00
Bond_009
fc049caba2 Merge branch 'master' into nullable3 2020-04-15 11:09:14 +02:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -04:00
Mark Monteiro
98044e7793 Document AuthenticationException correctly 2020-04-13 13:18:12 -04:00
Mark Monteiro
6d35dd6b32 Clean up SecurityException 
- Remove unused SecurityExceptionType
- Add missing constructor for InnerException
- Add missing documentation
 2020-04-13 13:13:48 -04:00
Joshua M. Boniface
bf92694f8b
Merge pull request #2715 from nyanmisaka/libfdk-aac 
Prefer to use libfdk_aac encoder for better audio quality when it is available
 2020-04-12 19:17:11 -04:00
Bond-009
84dba64644
Merge pull request #2821 from nyanmisaka/mpeg4 
Fix MPEG4 broken on VAAPI
 2020-04-12 11:44:17 +02:00
Nyanmisaka
62d9a48833
update as per suggestions 2020-04-12 17:34:25 +08:00
Nyanmisaka
e6f65863e3
update as per suggestions 2020-04-12 17:32:03 +08:00
Mark Monteiro
1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
Bond_009
49fe5e0a21 Fix some warnings 2020-04-11 12:03:10 +02:00
Mark Monteiro
64a255f090 Fix misformed xml doc comment 2020-04-10 15:02:54 -04:00
Nyanmisaka
6485c1eabc
probe Main/High 10 more specifically 2020-04-11 01:19:28 +08:00
Nyanmisaka
dd3f3089ef
minor changes 2020-04-10 22:41:27 +08:00
Nyanmisaka
e0ee61d114
fix mpeg4 failed on vaapi 2020-04-10 22:12:26 +08:00
Vasily
06c5b73c15
Merge pull request #2755 from Bond-009/dbcleanup 
Clean up SqliteItemRepository
 2020-04-10 00:20:53 +03:00
Bond_009
c2b5fb78ce Address comments 2020-04-09 19:27:03 +02:00
ferferga
4e894b4b66 Remove unnecessary space in hardware decoders argument for ffmpeg 2020-04-09 18:23:21 +02:00
Vasily
5b59cd2eb2
Merge pull request #2696 from mark-monteiro/fix-extras 
Display Extras With Unknown Types
 2020-04-07 23:39:31 +03:00
Vasily
e85f9f5613 Make localhost LiveTV restreams always use plain HTTP port 2020-04-07 18:41:15 +03:00
Nyanmisaka
0ecac47098 drop the unnecessary colorspace conversion 
Since 'hwdownload, format = nv12' has completed the conversion of colorspace. 'format = p010le' is redundant and will reduce the speed by almost half under the premise of unchanged cpu usage.
 2020-04-07 00:20:49 +08:00
Nyanmisaka
a5249730d7 mpeg4 profile 15 is not supported by vaapi device 2020-04-07 00:20:36 +08:00
Mark Monteiro
5bc6c08a0a Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-06 00:24:11 -04:00
Mark Monteiro
410a322fe2 Add CanConnectWithHttps to interface 2020-04-05 23:30:57 -04:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Mark Monteiro
f91f2ef328 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-05 10:07:17 -04:00
Mark Monteiro
efe3ebaab8 Eliminate circular dependency between LibraryManager and ImageProcessor 2020-04-04 16:01:10 -04:00
Mark Monteiro
7b31b0e322 Inject logger correctly into ActivityManager and ActivityRepository 2020-04-04 15:33:23 -04:00
Bond-009
0951dc632b
Update MediaBrowser.Controller/Entities/InternalPeopleQuery.cs 
Co-Authored-By: Mark Monteiro <marknr.monteiro@protonmail.com>
 2020-04-04 00:21:54 +02:00
Bond-009
d6224ddeda
Update InternalPeopleQuery.cs 2020-04-03 22:44:18 +02:00
Bond_009
8e7b15285e Clean up SqliteItemRepository 2020-04-03 20:59:38 +02:00
Bond_009
3161e85f76 Address comments 2020-04-03 17:30:01 +02:00
Mark Monteiro
ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Mark Monteiro
5b1091db27 Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup 2020-04-01 23:05:36 +02:00
Bond-009
f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +02: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
Mark Monteiro
1a4d9d4c53 Code review suggestions 2020-04-01 19:41:52 +02:00
Bond_009
3ab50f5a3f Address comments 2020-04-01 19:05:41 +02:00
Bond_009
787049f35f Merge branch 'master' into minor 2020-04-01 18:53:22 +02:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Nyanmisaka
d9b78a1dc5
update as per suggestion 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-02 00:48:43 +08:00
Mark Monteiro
cc8294842a Add ExtraType.Unknown enum value and use it instead of null 2020-04-01 18:10:29 +02:00
Mark Monteiro
861bad1eda Apply suggestions from code review 2020-04-01 13:26:47 +02:00
Nyanmisaka
ebb7590350
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 07:48:29 +08:00
Vasily
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi 
Fix various bugs in HWA subtitle burn-in
 2020-03-31 23:19:44 +03:00
Nyanmisaka
cf98a1fbc7
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 00:22:10 +08:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
db23660660 prefer to use libfdk_aac for better audio quality 2020-03-30 15:53:49 +08:00
Nyanmisaka
0c6ac38454 fix graphical subtitle scaling for NVDEC 2020-03-30 14:48:44 +08:00
Nyanmisaka
111095c2b0 fix QSV HWA failed when burning text subtitles 
ffmpeg 4.3+ is required for better transcoding speed(more than twice increase).
Using qsv on Linux also requires a fix in ffmpeg 4.3+.
See 74007dd86a
 2020-03-30 14:47:55 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Bond-009
5acd0521a2
Merge pull request #2639 from alset333/master 
Change DeinterlaceMethod's "bobandweave" to "yadif" or "yadif_bob", and set default value
 2020-03-29 23:03:01 +02:00
Mark Monteiro
e266ad51c5 Simplify logic; remove unnecessary methods 2020-03-28 14:17:33 +01:00
Mark Monteiro
ea306e8f6d Do not assign an invalid value of zero to ExtraType 2020-03-28 13:54:14 +01:00
Mark Monteiro
5fcbedc194 Display extras with an unknown type 2020-03-28 13:40:56 +01:00
Luke Foust
0fb78cf54b Add documentation around Name, Id, and Type. Changed ExternalIdType to ExternalIdMediaType 2020-03-26 14:26:12 -07:00
Luke Foust
ae4e727b24 Merge branch 'master' of https://github.com/lfoust/jellyfin into externalid-type 2020-03-26 13:36:18 -07:00
Mark Monteiro
aa9737afb3 Update .NET Core to 3.1.3 2020-03-25 20:09:48 +01:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
dkanada
86f614b26b
Merge pull request #2638 from mark-monteiro/update-asp 
Update .NET Core to 3.1.2
 2020-03-23 18:48:22 +09:00
Luke Foust
9bdb99fe92 Add type to externalids to distinguish them in the UI 2020-03-22 12:58:53 -07:00
Mark Monteiro
6897a19051 Add missing null check when retrieving extras 2020-03-22 15:09:51 +01:00
Mark Monteiro
debab44870 Update all packages to .NET Core 3.1.2 2020-03-22 02:03:07 +01:00
Mark Monteiro
dc140429fe Do not create unnecessary instances of IService at server startup 2020-03-21 23:17:30 +01:00
Mark Monteiro
aa546dd36a Rename command line option to --nowebclient and config setting to HostWebClient 2020-03-21 18:25:09 +01:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master 
Pull latest to my fork
 2020-03-19 22:02:08 -04:00
dkanada
a96c0a72b8
Merge pull request #2549 from dkanada/refactor 
Refactor some provider classes
 2020-03-18 17:43:15 +09:00
Mark Monteiro
ef7497e837 Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-15 19:50:00 +01:00
dkanada
7aec11d621
Merge pull request #2497 from mark-monteiro/1914-prevent-duplicates-in-playlists 
Check for duplicates when adding items to a playlist
 2020-03-16 02:49:57 +09: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
a67e32f8ec Clean up and document BrowserLauncher correctly 2020-03-15 13:14:57 +01:00
Mark Monteiro
4102e3afd0 Rename IsNoWebContent to NoWebContent 2020-03-15 13:00:14 +01:00
Mark Monteiro
9a7875b6f9 Do not check for duplicates if they are allowed in playlist configuration 2020-03-13 23:14:25 +01:00
Mark Monteiro
79413d9f33 Add a configuration flag to allow/disallow duplicates in playlists 2020-03-13 23:11:59 +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
Mark Monteiro
d437950ac3 Parse config value correctly 2020-03-11 22:55:10 +01:00
Mark Monteiro
29bad073eb Use config setting to decide if web content should be hosted 
Also fail server startup if web content is expected but missing
 2020-03-11 22:54:54 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Bond-009
008a76cf4d
Merge pull request #2502 from JustAMan/baseitem-equals 
Adds BaseItem.Equals method that compares items by their Id
 2020-03-11 16:00:36 +01:00
Bond-009
a7e1a5c96a
Merge pull request #2506 from mark-monteiro/inject-loggers-with-context 
Inject loggers with context using ILogger<T>
 2020-03-10 15:04:35 +01:00
dkanada
4f195f289c remove useless interface 2020-03-10 00:10:02 +09:00
dkanada
52fde64f10 remove unused files and fix some future warnings 2020-03-09 23:30:57 +09:00
Vasily
f4ccee5801 Add inheritdoc comment and squash simple method bodies 2020-03-05 15:03:17 +03:00
Vasily
456f571343 Follow code review suggestions 2020-03-05 14:25:50 +03:00
Bond_009
be1d4b32c6 Add speed for alpha numeric sorting 2020-03-05 00:57:24 +01:00
Vasily
007c5b9f67 Implement BaseItem.GetHashCode override 2020-03-04 13:06:13 +03:00
Mark Monteiro
b67e9cde8c Replace ILogger with ILogger<T> wherever possible 
Log entries will contain additional class context when using this interface
 2020-03-03 23:07:10 +01:00
dkanada
c07e1e4f84
Merge pull request #2476 from JustAMan/playto-sort 
Bring back sorting when needed to fix PlayTo
 2020-03-04 01:53:26 +09:00
Vasily
f21cd30039 Lower log level for BaseItem.Equals to debug 2020-03-03 19:22:45 +03:00
Bond-009
1c21248e2e
Merge pull request #2474 from JustAMan/simplify-sorting 
Simplify AlphanumericComparer, reduce code duplication
 2020-03-02 12:28:31 +01:00
Vasily
13d30a0a79
Merge pull request #2436 from dkanada/music 
Add config options for MusicBrainz
 2020-03-02 12:54:17 +03:00
Vasily
ba8d8cede9 Replace foreach with for - MOAR SPEED 2020-03-02 12:39:34 +03:00
Vasily
9a9f2aa293
Apply suggestions from code review 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-03-02 12:36:44 +03:00
Vasily
376bbb40bd Apply code review suggestion 2020-03-02 12:34:34 +03:00