Commit Graph

17729 Commits

Author SHA1 Message Date
Matt Montgomery
df0d197dc8 Apply suggestions from code review 2020-08-26 15:24:24 -05:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
Joshua M. Boniface
4e3f26b647
Merge pull request #3988 from crobibero/pack-license
Use proper SPDX Identifier
2020-08-26 09:46:41 -04:00
crobibero
b02650ec2f use proper spdx 2020-08-26 07:39:01 -06:00
crobibero
4e175adf49 revert rename 2020-08-26 07:37:17 -06:00
crobibero
5f60da29c7 switch to spdx 2020-08-26 07:36:57 -06:00
crobibero
670c41ee89 Properly pack project license 2020-08-25 21:33:19 -06:00
Joshua M. Boniface
e83f6d6ec7
Merge pull request #3889 from Ullmie02/nuget-versioning
Build Unstable NuGet packages
2020-08-25 17:08:06 -04:00
Joshua M. Boniface
cf6ef9958d
Merge pull request #3910 from barronpm/event-rewrite-1
Event Rewrite (Part 1)
2020-08-25 16:59:35 -04:00
David
bcdae0c5a7 Use array, remove VS code line 2020-08-25 10:08:05 +02:00
Bond-009
25be1a9b20
Merge pull request #3977 from barronpm/librarycontroller-getdownload-async
Make LibraryController.GetDownload async
2020-08-25 08:41:42 +02:00
Patrick Barron
b5bbbb9cef Document SubtitleDownloadFailureEventArgs 2020-08-24 20:34:53 -04:00
Patrick Barron
2eb9a3670b Document PlaybackStartEventArgs 2020-08-24 20:34:42 -04:00
Patrick Barron
71c33d09c4 Document IEventConsumer 2020-08-24 20:34:33 -04:00
Patrick Barron
fa8892fde4 Make LibraryController.GetDownload async 2020-08-24 20:27:10 -04:00
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
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
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
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
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
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