Commit Graph

2274 Commits

Author SHA1 Message Date
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
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
Bond_009 7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +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
dkanada deafe59b7e add the timestamp property back to the version info 2020-05-24 16:59:05 +09:00
dkanada 7972daaba4 fix a few issues with the plugin manifest 2020-05-24 15:40:27 +09: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
Mark Monteiro 07897ec7af Specify enum values for ExternalIdMediaType explicitly 2020-05-23 15:49:02 -04:00
Vasily 1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +03:00
artiume ae4c407b6d
Add .edl Mimetype 2020-05-20 16:46:33 -04: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
Patrick Barron 3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04: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 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
dkanada 4b4b50f3ee
Merge pull request #3115 from MrTimscampi/ffprobe
Parse color transfer and color primaries from ffprobe, and fix video range
2020-05-18 00:06:07 +09:00
MrTimscampi 9314434bbf Fix suggestions 2020-05-16 17:35:34 +02:00
dkanada 8921c7a5bf
Merge pull request #3113 from Artiume/patch-1
Fix Progressive and Interlaced Stream capitalization
2020-05-16 21:56:25 +09:00
dkanada ddebc9301e
Merge pull request #3116 from Artiume/patch-2
Update Books Resolver File Types and add .opf Mime Type
2020-05-16 16:01:59 +09: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
artiume a765272c17
Update MimeTypes.cs 2020-05-15 09:38:26 -04:00
artiume 527029af92 Update MediaStream.cs 2020-05-15 09:36:30 -04:00
artiume d41cdb3b7a Update Interlace 2020-05-15 09:36:30 -04:00
artiume eb3ce3fb87 Fix Progressive Stream 'P' capitalization 2020-05-15 09:36:30 -04:00
artiume 9ed8c6cb11
Add opf mimetype 2020-05-15 07:59:46 -04:00
Patrick Barron 87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
MrTimscampi 234292453f Add HLG to the video range detection 2020-05-14 18:44:51 +02:00
Mark Monteiro 2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00: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
Patrick Barron 6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Mark Monteiro dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -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
artiume 3e14b1b50f
Remove ogg video mimetype 2020-05-07 15:58:20 -04: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
Davide Polonio 5c6339d8fd
Fix typo in PublicUserDto
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-07 09:14:00 +02:00
Davide Polonio 57cf19f058 Fix variable declaration and follow sonarcloud suggestions 2020-05-06 17:25:41 +02:00
dkanada cd07bc23f8
Merge pull request #3050 from Artiume/patch-1
Update MimeTypes.cs
2020-05-06 21:56:45 +09:00
artiume 1388464329
Update MimeTypes.cs 2020-05-06 08:23:56 -04:00
artiume 1058c80a41
Update MediaBrowser.Model/Net/MimeTypes.cs 2020-05-06 07:45:40 -04:00
artiume 0aff46631f
Update MediaBrowser.Model/Net/MimeTypes.cs
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2020-05-06 07:38:19 -04:00
Mark Monteiro 432aae0fcc Add missing comma 2020-05-05 11:17:03 -04:00
artiume 183514ebe2
add azw3 2020-05-05 07:25:32 -04:00
artiume 25651362bf
Update MimeTypes.cs 2020-05-04 12:13:50 -04:00
artiume 675cbd8a16
Update MimeTypes.cs 2020-05-03 18:23:25 -04:00
Patrick Barron 032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond_009 7659a2ab32 Remove ListHelper extensions 2020-05-01 16:48:33 +02:00
Bond-009 690fb65cd8
Merge pull request #2985 from sparky8251/prometheus
Add Prometheus exporters
2020-04-29 11:36:05 +02:00
Vasily 5922c35d69
Merge pull request #2920 from Bond-009/tests2
Add some simple tests
2020-04-29 12:17:01 +03:00
gion 73fcbe90c0 Send error messages to clients 2020-04-27 22:39:37 +02:00
gion 083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion 40889702d0 Update session ping 2020-04-27 22:39:37 +02:00
gion 6519eebabb Implement NTP like time sync 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