Patrick Barron
|
9fa4fff15d
|
Merge branch 'master' into event-rewrite-1
# Conflicts:
# Emby.Dlna/Emby.Dlna.csproj
# Emby.Dlna/Eventing/DlnaEventManager.cs
# Emby.Dlna/Service/BaseService.cs
# Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
# MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
|
2020-08-24 20:04:13 -04:00 |
|
nyanmisaka
|
d7caf88df6
|
expose max_muxing_queue_size to user
|
2020-08-25 02:20:46 +08:00 |
|
Bond-009
|
ec3104d2d2
|
Merge pull request #3975 from nyanmisaka/muxer
Increase the max muxing queue size for ffmpeg
|
2020-08-24 19:32:38 +02:00 |
|
nyanmisaka
|
6462ca0036
|
increase the max muxing queue size for ffmpeg
|
2020-08-24 22:54:14 +08:00 |
|
crobibero
|
9626101c9f
|
Merge remote-tracking branch 'upstream/master' into 3.1.7
|
2020-08-24 07:39:16 -06:00 |
|
Bond-009
|
7ce21d436b
|
Merge pull request #3961 from crobibero/api-json-null
Ignore null json values
|
2020-08-23 16:27:24 +02:00 |
|
crobibero
|
cb44f16068
|
Merge remote-tracking branch 'upstream/master' into output-formatters
|
2020-08-23 07:53:33 -06:00 |
|
crobibero
|
340f83c3f5
|
Ignore null json values
|
2020-08-23 07:48:12 -06:00 |
|
Joshua M. Boniface
|
f9bb79285b
|
Merge pull request #3959 from Bond-009/warn27
Enable TreatWarningsAsErrors for Emby.Data in Release
|
2020-08-22 23:50:52 -04:00 |
|
Joshua M. Boniface
|
3a99a4770c
|
Merge pull request #3958 from Bond-009/warn26
Enable TreatWarningsAsErrors for MediaBrowser.Controller in Release
|
2020-08-22 23:50:43 -04:00 |
|
Hilman Maulana
|
e88b7b8d0e
|
Translated using Weblate (Indonesian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/id/
|
2020-08-22 18:45:59 -04:00 |
|
Bond_009
|
c4d8275fc1
|
Fix duplicate
|
2020-08-23 00:26:32 +02:00 |
|
Bond_009
|
4243a17c86
|
Enable TreatWarningsAsErrors for Emby.Data in Release
|
2020-08-22 23:29:54 +02:00 |
|
Bond_009
|
5ec1a979b2
|
Remove extra newline
|
2020-08-22 21:57:28 +02:00 |
|
Bond_009
|
404bb4f835
|
Enable TreatWarningsAsErrors for MediaBrowser.Controller in Release
|
2020-08-22 21:56:24 +02:00 |
|
Bond-009
|
92c491397e
|
Merge pull request #3941 from crobibero/no-more-form
Conver all remaining form request to body
|
2020-08-22 13:06:12 +02:00 |
|
Joshua M. Boniface
|
3e65cae70e
|
Merge pull request #3955 from Bond-009/async3
Make some methods async
|
2020-08-21 18:03:07 -04:00 |
|
Bond-009
|
4d64041a92
|
Merge pull request #3951 from crobibero/json-nullable-number
Add nullable int32, int64 json converters
|
2020-08-21 23:42:47 +02:00 |
|
Bond-009
|
1073d41c4d
|
Merge pull request #3950 from crobibero/dlna-play-to
Fix dlna play to
|
2020-08-21 23:42:40 +02:00 |
|
Bond_009
|
4916bfb024
|
Address comment
|
2020-08-21 22:59:47 +02:00 |
|
crobibero
|
33f6e410ac
|
Merge remote-tracking branch 'upstream/master' into json-nullable-number
|
2020-08-21 14:38:32 -06:00 |
|
crobibero
|
d951554779
|
fix copy-pasta
|
2020-08-21 14:37:51 -06:00 |
|
Bond-009
|
03c89fa717
|
Merge pull request #3953 from crobibero/dotnetglob
bump DotNet.Glob
|
2020-08-21 22:32:47 +02:00 |
|
Bond_009
|
2b832de289
|
Fix build
|
2020-08-21 22:19:16 +02:00 |
|
Bond_009
|
6329a36a27
|
Make method async
|
2020-08-21 22:06:06 +02:00 |
|
Bond_009
|
119f64f5e7
|
Make some methods async
|
2020-08-21 22:01:19 +02:00 |
|
Anthony Lavado
|
72115c91e0
|
Merge pull request #3943 from Bond-009/ffmpeg
Simplify FFmpeg detection code
|
2020-08-21 15:04:58 -04:00 |
|
crobibero
|
89c9ca68f9
|
bump DotNet.Glob
|
2020-08-21 11:50:45 -06:00 |
|
crobibero
|
4a64819277
|
Fix dlna produces type
|
2020-08-21 11:10:29 -06:00 |
|
crobibero
|
384a62dc08
|
Add nullable int32, int64 json converters
|
2020-08-21 10:23:47 -06:00 |
|
crobibero
|
07e7125d07
|
Fix dlna play to
|
2020-08-21 07:24:44 -06:00 |
|
Anthony Lavado
|
cd49beb7ad
|
Merge pull request #3947 from Bond-009/warn25
Fix all warnings in Emby.Dlna
|
2020-08-20 17:34:40 -04:00 |
|
Bond_009
|
170e434f92
|
Fix all warnings in Emby.Dlna
|
2020-08-20 21:04:57 +02:00 |
|
crobibero
|
2ca8d31b20
|
clean up output formatters
|
2020-08-20 11:17:27 -06:00 |
|
Anthony Lavado
|
ac58d07e0e
|
Merge pull request #3939 from Bond-009/warn24
Make MediaBrowser.MediaEncoding warnings free
|
2020-08-20 12:50:30 -04:00 |
|
Bond-009
|
6292a9e4e9
|
Merge branch 'master' into warn24
|
2020-08-20 18:50:15 +02:00 |
|
Bond-009
|
8cbefdd561
|
Merge pull request #3942 from Ullmie02/dlna-warnings
Reduce warnings in Emby.Dlna
|
2020-08-20 18:38:38 +02:00 |
|
David
|
1337a0dcec
|
Code review
|
2020-08-20 17:59:27 +02:00 |
|
Bond_009
|
301e029d42
|
Add unsupported ffmpeg version to tests
|
2020-08-20 17:45:40 +02:00 |
|
Bond_009
|
cb5cb075a9
|
Simplify FFmpeg detection code
|
2020-08-20 17:16:09 +02:00 |
|
David
|
ca2b36bdb0
|
Reduce warnings in Emby.Dlna
|
2020-08-20 17:08:33 +02:00 |
|
Bond-009
|
eda29dbccb
|
Merge pull request #3216 from rotvel/feature/ffmpeg-version-check
Try harder at detecting ffmpeg version and enable the validation
|
2020-08-20 16:40:35 +02:00 |
|
Bond-009
|
5160e627f1
|
Merge branch 'master' into feature/ffmpeg-version-check
|
2020-08-20 16:40:03 +02:00 |
|
crobibero
|
d63f4bce5d
|
Conver all remaining form request to body
|
2020-08-20 07:53:53 -06:00 |
|
nyanmisaka
|
54349fc945
|
fix outputSize
|
2020-08-20 19:08:36 +08:00 |
|
Bond_009
|
6123e2e848
|
Fix build
|
2020-08-20 12:24:34 +02:00 |
|
Bond_009
|
ab2147751f
|
Make MediaBrowser.MediaEncoding warnings free
|
2020-08-20 12:16:24 +02:00 |
|
Bond-009
|
250e351613
|
Merge pull request #3938 from crobibero/fix-audio-routes
Fix conflicting audio routes
|
2020-08-20 10:52:28 +02:00 |
|
IR0NCaT
|
3d84047320
|
Translated using Weblate (Russian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ru/
|
2020-08-20 02:30:38 -04:00 |
|
Patrick Barron
|
98ed90c4a2
|
Merge branch 'master' into event-rewrite-1
|
2020-08-19 18:11:17 -04:00 |
|