Commit Graph

2933 Commits

Author SHA1 Message Date
crobibero
dd5579e0eb Move FilterService to Jellyfin.Api 2020-06-07 22:04:59 -06:00
Patrick Barron
75af0a4e57 Implement more review suggestions 2020-06-07 19:37:47 -04: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
1a67a34bd6
save configuration when updating repository list
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-06-06 18:37:45 +09:00
Patrick Barron
bb23ce3466 Merge branch 'master' into userdb-efcore 2020-06-05 22:31:13 -04:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Andreas B
d92b32a4c6 Fix incorrect HLS master playlist fields
Resolves: #3224
2020-06-05 22:05:33 +02:00
crobibero
a787efc660 Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks 2020-06-04 15:16:04 -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
Cody Robibero
601e4a88c9
Merge pull request #2933 from crobibero/api-device
DeviceService to Jellyfin.Api
2020-06-04 07:29:23 -06:00
crobibero
88b6c26472 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-channel
# Conflicts:
#	Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
2020-06-03 09:38:49 -06: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
David
638cfa32ab Move SearchService to new API endpoint 2020-06-02 15:07:07 +02:00
danieladov
be5ce32bb6
refactor MediaBrowser.Api/VideosService.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-05-31 20:42:22 +02:00
danieladov
8e0b1109bc
refactor
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-05-31 20:35:09 +02:00
Mister Rajoy
1b90798b90 Order ids to merge to avoid stack overflow
As said in https://github.com/jellyfin/jellyfin/issues/3176, merging 1 with 2 and then 2 with 1 cause an stack overflow. sorting ids first fix the problem
2020-05-31 20:23:23 +02:00
Bond_009
7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
dkanada
ecadde1e18
Merge pull request #3192 from jellyfin/audio
Fix issue with audio transcoding
2020-05-27 20:20:50 +09:00
dkanada
73d123fe36 fix issue with audio transcoding 2020-05-27 13:55:45 +09: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
Joshua M. Boniface
0be3dfe7c5
Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -04: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
279f0da980 Rename ImageInfo.Hash to ImageInfo.BlurHash 2020-05-26 00:52:13 +03:00
artiume
a661b37c12
Update LibraryService.cs 2020-05-22 14:40:41 -04:00
Vasily
1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +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
Patrick Barron
1d1a145ad4 Fix issues and add profile image support 2020-05-20 10:04:00 -04:00
Patrick Barron
d35a7ba8bd Fix more issues 2020-05-20 10:04:00 -04: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
Vasily
02da312f8a Fix compilation after rebase 2020-05-19 00:22:52 +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
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
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
gion
e8f45248aa Fix code issues 2020-05-15 18:47:16 +02:00
Patrick Barron
dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -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
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
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -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
Patrick Barron
62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00: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
dkanada
c15463fa12
Merge pull request #2837 from Bond-009/async2
Minor IAsyncDisposable improvements
2020-05-06 20:30:03 +09: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
7f7a686ea6
Merge pull request #2573 from YouKnowBlom/add-hls-fields
Add codecs, resolution and frame-rate fields to HLS master playlist
2020-05-01 11:20:56 +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
0b974d09ca Synchronize access to data 2020-04-28 14:12:06 +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
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
Bruce
c7fe8b04cc PackageService to Jellyfin.API 2020-04-25 19:59:31 +01:00
Andreas B
153ea9f027 Fix error in HLS codecs field when level is null 2020-04-25 15:22:09 +02:00
crobibero
714aaefbcc Transfer EnvironmentService to Jellyfin.Api 2020-04-24 18:20:36 -06:00
crobibero
5ca7e1fd79 Move ChannelService to Jellyfin.Api 2020-04-23 08:54:28 -06: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
crobibero
a06d271725 Move ConfigurationService to Jellyfin.Api 2020-04-22 13:07:21 -06: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
Vasily
07143bcb68
Merge pull request #2466 from dkanada/plugin
Update plugin classes for nightly builds
2020-04-21 01:45:52 +03:00
crobibero
e151d539f2 Move ImageByNameService to Jellyfin.Api 2020-04-20 13:06:29 -06:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
dkanada
3142c9b990
Merge pull request #2916 from Bond-009/minor2
Minor improvements
2020-04-20 13:52:27 +09:00
crobibero
21b54b4ad8 Move DeviceService to DevicesController 2020-04-19 19:33:55 -06:00
crobibero
a41d5fcea4 Move AttachmentsService to AttachmentsController 2020-04-19 17:36:05 -06:00
crobibero
a96db5f48e Remove old scheduled tasks service 2020-04-19 16:32:03 -06:00
crobibero
a282fbe966 Move DisplayPreferences to Jellyfin.Api 2020-04-19 12:26:38 -06:00
Joshua M. Boniface
5c669d7ad7
Merge pull request #2849 from lyonzy/patch-1
Handle null outputFileExtension in GetOutputFilePath
2020-04-19 12:45:08 -04:00
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02:00
Matt Lyons
e7fde6aaca
Handle null outputFileExtension with null-conditional operator 2020-04-17 16:13:56 +10:00
Bond-009
31769bda28
Merge pull request #2745 from Artiume/patch-6
Force Audio Transcoding for LiveTV Transcoding
2020-04-15 23:23:56 +02:00
Bond_009
fc049caba2 Merge branch 'master' into nullable3 2020-04-15 11:09:14 +02:00
Bond_009
38dae51ccf Minor IAsyncDisposable improvements 2020-04-15 11:05:32 +02:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -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
dkanada
cb2523e2ef merge branch master into plugin 2020-04-13 14:38:19 +09:00
Matt Lyons
b52199e9e2
Handle null outputFileExtension in GetOutputFilePath 2020-04-13 12:44:15 +10:00
Vasily
6386b9b1b9
Merge pull request #2782 from JustAMan/fix-ssa-delivery
Fix support for attachments with baseURL set
2020-04-12 23:37:34 +03:00
Bond-009
14674d4469
Merge pull request #2772 from barronpm/codecleanup
MediaBrowser.Api code cleanup
2020-04-11 19:30:23 +02:00
Mark Monteiro
1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
dkanada
bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada
8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09: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
Bond-009
3a98ad8255
Merge pull request #2721 from PrplHaz4/patch-2
Separate Channels permissions from All Libraries
2020-04-07 19:10:34 +02:00
Patrick Barron
555651aae2 Fixed indentation and corrected typo 2020-04-06 23:17:49 -04:00
Vasily
5be60782ed Fix support for attachments with baseURL set
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
2020-04-06 14:06:42 +03:00
Patrick Barron
c9da49ebaa Implemented more suggestions 2020-04-05 23:12:25 -04:00
Patrick Barron
47ba4a84cd Simplified more conditionals 2020-04-05 18:06:30 -04:00
Patrick Barron
81b4a4c54c Implement various suggestions 2020-04-05 17:58:39 -04:00
Patrick Barron
e1958e3902 Miscellaneous code cleanup 2020-04-05 15:56:08 -04:00
Patrick Barron
add0a2088d Simplified Conditionals and returns 2020-04-05 14:44:14 -04:00
Patrick Barron
80cfcf5643 Remove unnecessary casts and explicit array types 2020-04-05 13:00:35 -04:00
Patrick Barron
86c06996b1 Remove redundant name qualifiers 2020-04-05 12:48:22 -04:00
Patrick Barron
961f48f5bc Use ? and ?? where applicable 2020-04-05 12:45:01 -04:00
Patrick Barron
6a3f9253db Convert using statements to using declarations where applicable 2020-04-05 12:26:11 -04:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Patrick Barron
5966ee6d87 Convert type checks and null checks into pattern matching 2020-04-05 12:07:43 -04:00
PrplHaz4
46453549b5
Start line with Boolean 2020-04-05 07:26:21 -04:00
PrplHaz4
b05e04c0cb
Collapse IsInEnabledFolder to single expression
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-05 06:42:15 -04:00
Mark Monteiro
efe3ebaab8 Eliminate circular dependency between LibraryManager and ImageProcessor 2020-04-04 16:01:10 -04:00
artiume
d10ae74b38
Force Audio Transcoding for LiveTV Transcoding
Noticing some sync issues when transcoding livetv, the only thing I was able to do to fix it was to force the audio stream to be transcoded as well. This was how I originally wrote the code and we changed it during the review process. I am reverting it back to the original code.
2020-04-02 14:14:57 -04:00
Mark Monteiro
377f9896ce Small fixes 2020-04-01 19:04:00 +02:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Mark Monteiro
cc8294842a Add ExtraType.Unknown enum value and use it instead of null 2020-04-01 18:10:29 +02: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
PrplHaz4
025888204d
Fix permission setting on Channels
Currently, permission settings on Channels are not taken into account prior to returning `{UserName} is not permitted to access Library {ItemName}.`.  Whether or not a user can see items within the Channel is solely dependent on `EnableAllFolders`, so you cannot view a plugin's Channels unless you can also see ALL libraries.

This PR enables does two things for Channel-providing Plugins:
1. Fixes functionality of "EnableAllChannels"
2. Allows users with Channel permissions to access all folders within that Channel

I'm not 100% sure on 2 but I wasn't able to see an obvious way to propagate permissions downward into specific Folders inside a Channel.

I tested on a fairly simple library with two channel-providing plugins (ServerWMC, LazyMan) and it seems to work, but this behavior should also be tested by someone with more content/collections.
2020-03-30 17:14:59 -04:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
0af353404c fix the UTF-16 error while burning ass/ssa subtitles 2020-03-30 14:47:55 +08:00
Nyanmisaka
0e9d9a7897 fix the incorrect HLS time while using hw encoders 2020-03-30 14:48:57 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Mark Monteiro
e266ad51c5 Simplify logic; remove unnecessary methods 2020-03-28 14:17:33 +01:00
Mark Monteiro
5fcbedc194 Display extras with an unknown type 2020-03-28 13:40:56 +01:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Andreas B
0a2d24aff3 Add RESOLUTION field to HLS master playlist 2020-03-19 23:39:33 +01:00
Andreas B
8a990d1d95 Add FRAME-RATE field to HLS master playlist 2020-03-19 23:39:33 +01:00
Andreas B
f2858878d1 Add CODECS field to HLS master playlist 2020-03-19 23:39:23 +01:00
Andreas B
85da15685f Refactor DynamicHlsService.AppendPlaylist to use StringBuilder 2020-03-15 15:06:38 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Bond_009
bbd4860b55 Another warning 2020-03-11 16:30:22 +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
MrTimscampi
e8c593f413 Add baseURL to attachments 2020-03-07 17:41:36 +01: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
Davide Polonio
cd471ed4df Fix emby/users/public not taking into account first run
The previous implementation was not taking in account the first seup
phase. Now the check has been added.

A little method refactor has been done in order to make the code more
elegant.
2020-03-03 20:20:35 +01:00
Davide Polonio
737d4d2b3f
Fix conditional with a less verbose one
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-03-03 19:51:03 +01:00
Davide Polonio
5d760b7ee8 Fix emby/user/public API leaking private data
This commit fixes the emby/user/public API that was returning more data
than necessary. Now only the following information are returned:
- the account name
- the primary image tag
- the field hasPassword
- the field hasConfiguredPassword, useful for the first wizard only
(see
https://github.com/jellyfin/jellyfin/issues/880#issuecomment-465370051)
- the primary image aspect ratio

A new DTO class, PrivateUserDTO has been created, and the route has been
modified in order to return that data object.
2020-03-01 21:46:01 +01:00
Steven Tang
2e856ad9fe Fix download file with non-ASCII filename 2020-02-29 12:11:27 +08:00
dkanada
974a04c129 update plugin classes for nightly builds 2020-02-26 01:58:39 +09:00
artiume
697aee5b0c
Merge pull request #21 from jellyfin/master
nightly
2020-02-23 10:57:52 -05:00
Bond_009
07cc4be6a7 Fix some warnings
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
2020-02-23 12:11:43 +01:00
Bond_009
ffc9eb67f0 Switch remux and direct stream 2020-02-23 00:05:28 +01:00
artiume
4becaf83dd
Update MediaInfoService.cs 2020-02-22 10:03:17 -05:00
dkanada
61015c1d0f
Merge pull request #2321 from Bond-009/images
Simplify image processing by removing image enhancers
2020-02-21 12:32:54 +09:00
artiume
a4e0364139
Update MediaInfoService.cs 2020-02-19 06:15:55 -05:00
artiume
b375aeb56a
fix indentation
it was tabs
2020-02-19 06:07:48 -05:00
artiume
967f8c6dcd
Merge pull request #18 from jellyfin/master
nightly
2020-02-19 06:02:26 -05:00
artiume
63f13df6fc
Merge pull request #17 from jellyfin/master
10.5
2020-02-13 13:09:50 -05:00
dkanada
53db526667 merge branch master into refactor 2020-02-14 03:02:06 +09:00
artiume
40ad6f843f
Merge pull request #16 from jellyfin/master
nightly
2020-02-13 05:53:23 -05:00
Bond-009
a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Vasily
a26c1ab17d Remove commented code 2020-02-12 14:19:11 +03:00
Anthony Lavado
42066ee326
Merge branch 'master' into transcoding-throttling 2020-02-12 02:01:56 -05:00
Anthony Lavado
00073c162a
Merge pull request #2363 from dkanada/view
Add session view endpoint
2020-02-11 23:56:47 -05:00
artiume
b5342bb7d9
Fix MaxBitrate 2020-02-11 10:57:16 -05:00
artiume
a73ce1d781
Update MediaInfoService.cs 2020-02-06 17:21:10 -05:00
dkanada
1cb51a8ac7 rename session folder 2020-02-06 00:47:50 +09:00
dkanada
c2733ac0dc split api keys into their own service 2020-02-06 00:26:21 +09:00
artiume
3b6a4c3a33
Merge pull request #11 from jellyfin/master
nightly
2020-02-04 06:02:38 -05:00
dkanada
b7a9900556
Merge pull request #2357 from Bond-009/warn13
Fix warnings
2020-02-03 17:15:03 +09:00
dkanada
1bc8ca2542 add session view endpoint 2020-02-02 00:16:11 +09:00
dkanada
6341d986a9 fix a few warnings 2020-02-02 00:07:46 +09:00
dkanada
692a9bfdd0
update some comments
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-02-01 23:36:40 +09:00
dkanada
afe9ed977b improve scan progress and fix a few bugs 2020-02-01 22:44:27 +09:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
artiume
918df5e352 Merge remote-tracking branch 'jellyfin/master' 2020-01-26 09:33:31 -05:00
ThreeFive-O
4f3bfd9146 Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Bond_009
ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
Denis
549a2d8b6d
Enable path mapping in PlaybackInfo endpoint 2020-01-17 22:48:28 +03:00
Bond-009
8865b3ea3d Remove dead code and improve logging 2020-01-13 20:06:08 +01:00
Bond_009
976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009
cf13e89ad6
Update MediaBrowser.Api/Playback/MediaInfoService.cs
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-13 09:01:14 +01:00
Bond_009
84d1b12530 Attempt #2 2020-01-12 21:55:04 +01:00
Bond_009
da5893b0f1 Try to fix nullreff 2020-01-12 21:21:20 +01:00
dkanada
ce7744806c
Merge pull request #2216 from gnattu/master
Let HLS fallback to mpegts in case device reports unsupported container
2020-01-13 03:43:59 +09:00
gnattu
ea075c1b48
Add reminder to remove the workaround
This will be no longer needed when ffmpeg is ready

Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-12 13:22:20 -05:00
dkanada
d217f1614e
Merge pull request #2096 from Bond-009/embytv
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
2020-01-13 00:41:52 +09:00
Maximilian Marschall
081d942d03 Enable Throttling when transcoding without Hardware-Acceleration 2020-01-12 00:33:57 +01:00
dkanada
a272638a84
Merge pull request #2170 from Bond-009/mediainfoservice
Minor changes to MediaInfoService
2020-01-11 16:54:23 +09:00
Bond_009
d9ec502ff9 Address comments 2020-01-10 21:25:45 +01:00
Bond_009
e714b9930e Merge branch 'master' into embytv 2020-01-10 21:16:46 +01:00
Artiume
a40cb7bbd8
Merge pull request #7 from jellyfin/master
nightly
2020-01-09 12:14:54 -05:00
gnattu
d5204f572a Fix typo and plural 2020-01-09 02:25:05 -05:00