Commit Graph

3176 Commits

Author SHA1 Message Date
dkanada
bb7444db07
Merge pull request #3439 from cvium/ignore_application_folders
Never ignore application folders
2020-06-26 06:14:19 +09:00
Claus Vium
0f07b19ca5 Remove AllowIgnorePath 2020-06-25 11:33:10 +02:00
Patrick Barron
5ee419ebe4 Fix typo 2020-06-24 21:07:39 -04:00
Patrick Barron
9a01cd8590 Fix user deletion. 2020-06-24 20:19:47 -04:00
crobibero
ef8bec23c4 revert missing session fields 2020-06-24 15:09:15 -06:00
crobibero
1398c2117c Revert ILoggerFactory usage in BaseItem.cs 2020-06-23 07:31:59 -06:00
crobibero
f4d8e0e20c Merge remote-tracking branch 'upstream/master' into easypassword 2020-06-22 20:23:06 -06:00
David
1c78482b48 Use authorization code from api-migration to fix startup wizard 2020-06-20 18:02:03 +02:00
telans
6556bec646
brace multiline if statements (cont.) 2020-06-20 21:19:16 +12: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
8e3d874802
remove regions 2020-06-20 18:20:33 +12:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
telans
afe09612e8
fix SA1119 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
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
crobibero
a8adbef74f Add GetAuthorizationInfo for netcore HttpRequest 2020-06-15 13:21:18 -06:00
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
Anthony Lavado
100e9d586d
Merge pull request #3336 from telans/specific-fixes
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
2020-06-14 22:51:29 -04:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
6db1878011
Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
2020-06-15 10:55:33 +09:00
telans
afc9224ede
fix SA1111 2020-06-15 10:46:43 +12: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
telans
726e116d5b
fix SA1510 2020-06-15 10:40:57 +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
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
2020-06-13 00:29:43 +09:00
Patrick Barron
fc02157b42 Fix build errors 2020-06-11 18:28:49 -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
Patrick Barron
7fba0b778e Properly remove profile images 2020-06-11 17:51:02 -04:00
crobibero
30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter 2020-06-11 10:51:47 -06: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
Bond-009
ad5c41b542
Merge pull request #3258 from aled/2149-fix-a-small-number-of-compile-warnings-1
Fix a small number of compile warnings
2020-06-09 22:22:36 +02:00
Patrick Barron
d105bc728d Fix startup wizard. 2020-06-09 14:04:25 -04:00
ConfusedPolarBear
35ff2be9d7 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-08 14:43:58 -05:00
artiume
d650440492 fix opencl10bit 2020-06-08 14:45:26 +03:00
artiume
347689e4e2 Split VP9 HEVC 10bit button. MacOS Decoder fixed to opencl 2020-06-08 14:45:26 +03:00
Vasily
4999831604 Merge remote-tracking branch 'upstream/master' into hwaccel 2020-06-08 14:44:21 +03:00
crobibero
7ed5cf3dca Force configuration paths to not be ignored. 2020-06-07 20:32:06 -06:00
crobibero
68e1ecaaf9 Remove EasyPassword from Authentication providers 2020-06-07 14:47:08 -06:00
Patrick Barron
98142613e8 Apply review suggestions and fix bug 2020-06-07 13:36:43 -04:00
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
Daniyar Itegulov
613748b45d
Make books resumable and have duration of 1 second 2020-06-06 18:50:28 +10:00
crobibero
57d1dbfe7b undo erroneous changes 2020-06-05 18:29:58 -06:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -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
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
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master
Refactor copy codec checks
2020-06-03 02:47:15 -04:00
Anthony Lavado
91b089c0fa
Merge pull request #3179 from Bond-009/bugs
Fix some 'bugs' flagged by sonarcloud
2020-06-03 02:45:22 -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
crobibero
e30a85025f Remove log spam when using legacy api 2020-06-01 12:42:59 -06:00
Vasily
26eef1bbf8 Move logic of computing Blurhash components to ImageProcessor
Also rename last few instances of GetImageHash to GetImageBlurHash for clarity
2020-06-01 18:12:49 +03:00
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Vasily
9208acd5ae Convert non-local image to local before computing blurhash 2020-05-28 17:55:29 +03:00
Bond_009
7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
Vasily
edcfcadcd3 Make sure blurhash is recomputed if image changed or metadata refresh toggled 2020-05-27 17:00:59 +03:00
Patrick Barron
31f725fdbf Fix a bug in Emby.Notifications and clean up 2020-05-26 23:08:27 -04:00
Patrick Barron
eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -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
Vasily
8be13b63d4 More cleanup 2020-05-26 19:19:49 +03:00
Joshua M. Boniface
0be3dfe7c5
Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -04:00
Vasily
92008baf85 Some simple cleanup 2020-05-26 19:13:11 +03:00
Vasily
3e381cfd5e Clean GetHwaccelType Windows handling a tiny bit 2020-05-26 19:02:22 +03:00
Vasily
628734931c Fix missing commas and merge defects 2020-05-26 18:49:15 +03:00
artiume
abc7558f51 Update EncodingHelper.cs 2020-05-26 18:29:58 +03:00
artiume
f056704c78 add videotoolbox 2020-05-26 18:29:58 +03:00
artiume
62e47d056d Update IMediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
0eb5791c70 Comments 2020-05-26 18:29:58 +03:00
Nyanmisaka
22ef0e3574 drop 'force_original_aspect_ratio'
graphical subtitles can be off-center in some cases
2020-05-26 18:21:31 +03:00
Nyanmisaka
5fd3ea8b21 minor changes 2020-05-26 18:21:31 +03:00
Nyanmisaka
695f20b303 probe Main/High 10 more specifically 2020-05-26 18:21:31 +03:00
Nyanmisaka
161b2a2da9 minor changes 2020-05-26 18:19:14 +03:00
nyanmisaka
c4ba71d96a resolve conflicts 2020-05-26 18:13:20 +03:00
nyanmisaka
b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
gion
e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02: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
Bond_009
10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02: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
Mark Monteiro
4f6e5591ec Remove 'General' as an ExternalIdMediaType, and instead use 'null' to represent a general external id type 2020-05-23 16:08:51 -04:00
Patrick Barron
56212e8101 Warnings cleanup 2020-05-22 20:20:18 -04:00
Vasily
1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +03:00
Vasily
3fb4c1356c Make blurhash be computed during regular scans if it was not already computed 2020-05-20 23:50:17 +03:00
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron
7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -04:00
Vasily
2b1ae7ac58 Fix code smells 2020-05-19 15:42:50 +03:00
Vasily
a226a4ee03 Compute hash only when one is not computed in DB, small optimizations here and there 2020-05-19 14:50:14 +03:00
Jesús Higueras
fe480caf54 Add endpoint to update all items in library 2020-05-18 23:21:38 +03:00
Jesús Higueras
b9fc0d2628 Add BlurHash support to backend 2020-05-18 23:21:37 +03:00
Mark Monteiro
d06fee75b6 Rename Name to ProviderName 2020-05-17 17:36:36 -04:00
Mark Monteiro
c82f7eeca1 Clean up some doc comments 2020-05-17 17:26:40 -04:00
Mark Monteiro
67edf1b7f5 Do not convert 'Type' value to string unnecessarily, and do not replace 'General' type with null 2020-05-17 15:59:13 -04:00
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