Commit Graph

23 Commits

Author SHA1 Message Date
crobibero
eab92a0b01 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-06 14:34:31 -06:00
crobibero
29fc882037 merge all attributes 2020-09-06 09:07:27 -06:00
crobibero
b64108923a Add missing references 2020-09-05 17:11:44 -06:00
crobibero
59d47ec3f5 Make all FromRoute required 2020-09-05 17:07:25 -06:00
Claus Vium
81c764e87f
Merge branch 'master' into output-formatters 2020-09-04 11:44:15 +02:00
crobibero
4fc611bf29 fix merge 2020-09-03 13:50:02 -06:00
crobibero
a26063f775 fix merge 2020-09-03 13:48:48 -06:00
crobibero
eb2dcbddc0 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-03 13:47:00 -06:00
Bond-009
7582e17377
Merge pull request #3907 from crobibero/dlna
Fix DLNA Routes
2020-09-03 20:38:09 +02:00
crobibero
a523ff840c Merge remote-tracking branch 'upstream/master' into output-formatters 2020-09-03 12:14:11 -06:00
crobibero
932c4d25a4 Clean api return types 2020-09-02 15:06:13 -06:00
crobibero
2f33bee2a9 Set openapi schema type to file where possible 2020-09-01 17:26:49 -06: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
crobibero
cb44f16068 Merge remote-tracking branch 'upstream/master' into output-formatters 2020-08-23 07:53:33 -06:00
crobibero
4a64819277 Fix dlna produces type 2020-08-21 11:10:29 -06:00
Bond_009
170e434f92 Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
crobibero
3c395814fd fix dlna routes again 2020-08-16 10:53:57 -06:00
crobibero
7fe372749e fix dlna server routes 2020-08-16 08:32:13 -06:00
Patrick Barron
da9bcc5fb3 Rename IEventManager to IDlnaEventManager 2020-08-13 15:47:31 -04:00
crobibero
9e00aa3014 fix openapi validation errors 2020-08-03 14:38:51 -06:00
crobibero
4bb1e1c292 Fix docs, params, return values 2020-07-31 11:01:30 -06:00
crobibero
461b298be7 Migrate DlnaServerController to Jellyfin.Api 2020-04-21 19:15:27 -06:00