Commit Graph

16388 Commits

Author SHA1 Message Date
Erik Rigtorp
f144acdc96 Use glob patterns to ignore files 2020-05-15 18:33:18 -07:00
Erik Rigtorp
9cad598059 Fix container image build by installing python 2020-05-15 18:25:43 -07: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
652e9702fc
Merge pull request #3117 from JustAMan/no-more-doppelgangers
Fixes collections (and probably some extras support, too)
2020-05-16 00:01:49 +03:00
Mark Monteiro
757643e326 Merge remote-tracking branch 'upstream/master' into no-more-doppelgangers 2020-05-15 15:23:44 -04:00
Mark Monteiro
6e68702799 Do not run DELETE command if no extras are detected
Also log a message if no extras were detected 
Also log the path used for the database backup
Also add some comments to explain the migration
2020-05-15 15:12:26 -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
Vasily
43dc604e87 Fixed compilation, added backing db before removing extras 2020-05-15 21:49:45 +03:00
Patrick Barron
79dee27299 Fixed indentation 2020-05-15 14:33:36 -04:00
Vasily
034fe97eeb
Apply suggestions from code review
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
2020-05-15 21:32:56 +03:00
Patrick Barron
a7c2e524a9 Apply more review suggestions 2020-05-15 14:09:15 -04:00
gion
8c04049a59 Fix some code smells 2020-05-15 20:06:41 +02:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron
a5dee36808 Apply more review suggestions 2020-05-15 12:51:18 -04:00
gion
e8f45248aa Fix code issues 2020-05-15 18:47:16 +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
dkanada
18953d95e6
Merge pull request #3085 from MrTimscampi/vtt-position
Add positionning cues to WebVTT writer
2020-05-15 16:43:31 +09:00
dkanada
cb249cc171
Merge pull request #3118 from barronpm/fix-regressions
Fix regressions introduced by #3098
2020-05-15 16:43:06 +09:00
Odd Stråbø
ef533015ae Translated using Weblate (Norwegian Bokmål)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
2020-05-14 23:26:47 -04:00
Vasily
ed751aa054
Merge pull request #3084 from fhriley/fix_allow_origin
Fix #3083: Set the Access-Control-Allow-Origin header to the request …
2020-05-15 03:18:16 +03:00
Patrick Barron
dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -04:00
Erik Rigtorp
e02e041b23 If second cleaning results in same name skip lookup 2020-05-14 16:55:55 -07:00
Vasily
7c57134535 Implement a cleanup migration 2020-05-15 02:30:28 +03:00
Frank Riley
9ee10d22c8 Rename function 2020-05-14 16:15:09 -07:00
Frank Riley
6990af811a Use simpler dictionary iterator. 2020-05-14 16:15:09 -07:00
Frank Riley
c70c589236 Update Emby.Server.Implementations/HttpServer/HttpListenerHost.cs from review
Co-authored-by: Cody Robibero <cody@robibe.ro>
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
Vasily
ce16651dbd Fix a check broken by https://github.com/jellyfin/jellyfin/pull/2105 2020-05-15 01:55:53 +03:00
Patrick Barron
953777f1ba Removed unnecessary usings 2020-05-14 18:12:51 -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
artiume
4eb4ad3be7
Update Books Resolver File Types 2020-05-14 17:03:53 -04:00
Erik Rigtorp
de35183903
Update MediaBrowser.Providers/Tmdb/Movies/TmdbSearch.cs
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-14 11:56:31 -07:00
Erik Rigtorp
fa1fef1099
Update MediaBrowser.Providers/Tmdb/Movies/TmdbSearch.cs
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-14 11:56:25 -07:00
aled
3ff6e3ff65 Add code analyzers to Jellyfin.Naming.Tests and fix resulting warnings 2020-05-14 18:59:10 +01:00
MrTimscampi
2e18142bb3 Add color primaries to ffprobe output 2020-05-14 18:52:42 +02:00
MrTimscampi
234292453f Add HLG to the video range detection 2020-05-14 18:44:51 +02:00
MrTimscampi
428e1b04fc Add color transfer to ffprobe results 2020-05-14 18:11:32 +02:00
Vasily
5ce008e02f
Merge pull request #2162 from Bond-009/websocket
Rewrite WebSocket handling code
2020-05-14 18:49:44 +03:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
dkanada
11dd96f6c7
Merge pull request #3089 from MrTimscampi/tmdb-original-title
Add more information to TmdbSeriesProvider
2020-05-14 13:43:00 +09:00
aled
2849d2b134 Fix compile warnings in Jellyfin.Naming.Tests 2020-05-13 23:59:19 +01:00
Patrick Barron
9925742918 Implement more review suggestions 2020-05-13 17:55:31 -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