Commit Graph

486 Commits

Author SHA1 Message Date
Claus Vium
81c764e87f
Merge branch 'master' into output-formatters 2020-09-04 11:44:15 +02:00
Patrick Barron
d814302707 Merge branch 'master' into scoped-displaypreferences 2020-09-03 15:15:43 -04:00
Bond-009
7582e17377
Merge pull request #3907 from crobibero/dlna
Fix DLNA Routes
2020-09-03 20:38:09 +02:00
Bond-009
42f22a8e55
Merge pull request #3976 from nyanmisaka/muxer
Expose max_muxing_queue_size to user
2020-09-03 20:36:17 +02:00
crobibero
a523ff840c Merge remote-tracking branch 'upstream/master' into output-formatters 2020-09-03 12:14:11 -06:00
Claus Vium
2f9b482555
Merge branch 'master' into master 2020-09-03 14:54:00 +02:00
Nyanmisaka
12dcd809f9
minor changes
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-09-01 23:53:59 +08:00
Nyanmisaka
5c83dbd0c4
update as per suggestions 2020-09-01 23:39:19 +08:00
Bond-009
8ee042483a
Merge pull request #2888 from ConfusedPolarBear/quickconnect
Add quick connect (login without typing password)
2020-08-31 23:01:27 +02:00
Bond-009
1b1de4026d
Merge pull request #4028 from crobibero/cache-duration
Properly verify cache duration
2020-08-31 16:04:04 +02:00
Bond-009
1f4deccfa4
Merge pull request #4027 from cvium/fix_update_libraryoptions
Fix model binding in UpdateLibraryOptions
2020-08-31 15:44:47 +02:00
crobibero
db99903c35 Properly verify cache duration 2020-08-31 07:24:23 -06:00
Claus Vium
7103e764a4 Fix model binding in UpdateLibraryOptions 2020-08-31 14:47:57 +02:00
Bond-009
9a2f2aac22
Merge pull request #4018 from barronpm/library-entity-cleanup
Library Entity Cleanup
2020-08-31 11:00:28 +02:00
Patrick Barron
414bedbde4 Move library entities to folder. 2020-08-30 18:51:28 -04:00
PrplHaz4
34219e2831
Fix permissions for individual channel plugins #2858
Without this change, the only Channel (plugin, not Live TV) permission that works is "Enable All Channels".

Fixes #2858
2020-08-27 10:12:32 -04:00
Bond-009
4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease
Use Prerelease System.Text.Json
2020-08-26 18:59:46 +02:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05: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
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06: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
nyanmisaka
d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08:00
nyanmisaka
6462ca0036 increase the max muxing queue size for ffmpeg 2020-08-24 22:54:14 +08:00
crobibero
cb44f16068 Merge remote-tracking branch 'upstream/master' into output-formatters 2020-08-23 07:53:33 -06: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
4916bfb024 Address comment 2020-08-21 22:59: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
crobibero
4a64819277 Fix dlna produces type 2020-08-21 11:10:29 -06:00
crobibero
07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
Bond_009
170e434f92 Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00
crobibero
d63f4bce5d Conver all remaining form request to body 2020-08-20 07:53:53 -06: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
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
crobibero
11e3cdb3cb Fix conflicting audio routes 2020-08-19 15:08:28 -06:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Anthony Lavado
634ee2d1e9
Merge pull request #3861 from crobibero/fixes
API Fixes
2020-08-19 08:17:03 -04:00
crobibero
b90e240af6 rename clientCapabilities 2020-08-18 07:29:39 -06:00
crobibero
287baa4965 remove unused directives 2020-08-18 07:29:12 -06:00
Matt Montgomery
1ff4f8e6c6 Get userId from claim 2020-08-17 18:55:16 -05:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
crobibero
4ec1341c8f Fix conflicts 2020-08-17 15:54:51 -06:00
crobibero
29d8e38161 Merge remote-tracking branch 'upstream/master' into fixes 2020-08-17 15:54:40 -06:00
crobibero
be67528958 add disposal docs 2020-08-17 15:03:45 -06:00
crobibero
3a91047413 P E R F O R M A N C E 2020-08-17 14:59:00 -06:00
crobibero
9c6b4f033a revert lastordefault 2020-08-17 14:55:14 -06:00
crobibero
898ccab222 oop 2020-08-17 13:41:16 -06:00