michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,281 Commits 2 Branches 79 Tags 73 MiB
fc02157b42
Commit Graph

118 Commits

Author SHA1 Message Date
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
Patrick Barron
dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04: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
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
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
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
961f48f5bc Use ? and ?? where applicable 2020-04-05 12:45:01 -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
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
MrTimscampi
e8c593f413 Add baseURL to attachments 2020-03-07 17:41:36 +01: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
artiume
4becaf83dd
Update MediaInfoService.cs 2020-02-22 10:03:17 -05: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
b5342bb7d9
Fix MaxBitrate 2020-02-11 10:57:16 -05:00
artiume
a73ce1d781
Update MediaInfoService.cs 2020-02-06 17:21:10 -05:00
artiume
3b6a4c3a33
Merge pull request #11 from jellyfin/master 
nightly
 2020-02-04 06:02:38 -05: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
Denis
549a2d8b6d
Enable path mapping in PlaybackInfo endpoint 2020-01-17 22:48:28 +03: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
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
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
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Artiume
0e920a6d5f
Update MediaInfoService.cs 2019-12-20 23:40:36 -05:00
Artiume
963b69c7b2
Update MediaInfoService.cs 2019-12-20 23:17:01 -05:00
Bond_009
5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Bond-009
bb62dd14c2 Limit size for playbacktest 2019-12-19 17:46:17 +01:00
Bond-009
a5cd11735c Minor changes to MediaInfoService 2019-12-19 15:54:27 +01:00
Artiume
f3e7c72bac
Update MediaInfoService.cs 2019-12-16 15:22:18 -05:00
Artiume
b31f4ccbc2
Update MediaInfoService.cs 2019-12-16 14:53:42 -05:00
Artiume
46442e24f8
Update MediaInfoService.cs 2019-12-16 00:43:03 -05:00
Artiume
3fb7aabfde
Update MediaInfoService.cs 2019-12-16 00:40:25 -05:00
Artiume
64c313a8fb
Update MediaInfoService.cs 2019-12-16 00:27:48 -05:00
Artiume
be956dfd02
Update MediaInfoService.cs 2019-12-15 23:52:07 -05:00
Bond_009
5cab79c839 Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs 2019-12-04 21:39:27 +01:00
Bond_009
3221e837f9 * Add support for multi segment base urls 
* Make baseurl case-insensitive
 2019-11-25 11:55:24 +01:00
Andrew Mahone
a78aec56e3
Format attachment DeliveryURL with CultureInfo.InvariantCulture. 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-11-05 08:21:06 -05:00
Andrew Mahone
262a8f47af Remove attachment filenames from attachment URLs. 2019-11-04 11:31:41 -05:00
Andrew Mahone
20727906c8 Use attachment filename if available. 2019-10-22 11:54:59 -04:00
Andrew Mahone
01b1c847e9 Provide delivery URLs for attachments in PlaybackInfo. 2019-10-22 11:54:59 -04:00
Bond-009
6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00