Commit Graph

2335 Commits

Author SHA1 Message Date
cvium 78cab77f81 Add Known Proxies to system configuration 2020-09-10 11:05:46 +02:00
Anthony Lavado d08ddbb8d2
Merge pull request #4013 from crobibero/dynamic-cors
Allow CORS domains to be configured
2020-09-07 19:41:45 -04:00
crobibero 7de0fcfc94 Merge remote-tracking branch 'upstream/master' into startup-complete 2020-09-07 14:07:15 -06:00
BaronGreenback eedb520af1 Removed code that wasn't used. 2020-09-07 12:14:02 +01:00
crobibero 26c432b564 Rename StartupCompleted to StartupWizardCompleted 2020-09-06 14:27:31 -06:00
crobibero 9a74ace84b Add flag for startup completed 2020-09-05 09:20:58 -06:00
crobibero 8a08111adc Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-05 09:00:55 -06:00
Bill Thornton b065f5db1d Fix aac mime-type 2020-09-04 17:41:31 -04:00
Joshua M. Boniface 376e4793e6
Merge pull request #4035 from crobibero/api-doc-base-url
Fix apidoc routes with base url
2020-09-04 10:30:13 -04:00
crobibero 21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06:00
Nyanmisaka 4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Joshua M. Boniface 52aea85e7f
Merge pull request #4031 from Bond-009/warn28
Fix some warnings
2020-09-03 14:40:29 -04:00
Bond-009 9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements
Deinterlacing improvements
2020-09-03 20:38:54 +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 5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
crobibero 1de22af646 Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-03 07:48:34 -06:00
Bond-009 8c28824c88
Merge pull request #4042 from jellyfin/ci-packaging-fixes
Fixes for CI Nuget package pushing and CI triggers
2020-09-03 12:56:04 +02:00
Erwin de Haan 346581bb2a Fixes for CI Nuget package pushing and CI triggers
Also adds SourceLink support and symbols that are pushed to Nuget.
Add symbols to main nuget packages for unstable builds (Azure Artifacts does not support symbols outside of the main package)
SourceLink will enable stepping during debugging.
2020-09-02 22:42:00 +02:00
crobibero 1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
Claus Vium e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero 65d05f92ac Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-01 18:27:55 -06: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 e653eef44f Fix some warnings 2020-08-31 22:20:19 +02:00
crobibero bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
crobibero 3c0484cc97 Allow for dynamic cors response 2020-08-30 09:32:14 -06:00
crobibero ec8967b8e6 Fix partial library and channel access 2020-08-27 10:00:06 -06: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
crobibero b02650ec2f use proper spdx 2020-08-26 07:39:01 -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
crobibero 582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -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
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
crobibero 9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero 07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
Patrick Barron 98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009 2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Matt Montgomery 5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
Patrick Barron ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron 3ee940f7b3 Clean up GenericEventArgs 2020-08-13 19:14:03 -04:00
Patrick Barron 27139709e5 Remove ListHelper.cs 2020-08-13 17:05:55 -04:00
David b92fbe4d69 Use VersionPrefix 2020-08-13 19:03:24 +02:00
David a61f6e3308 Fix nuget ci 2020-08-13 15:22:12 +02:00
crobibero 6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
Matt Montgomery 4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00