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
|
340f83c3f5
|
Ignore null json values
|
2020-08-23 07:48:12 -06:00 |
|
crobibero
|
d951554779
|
fix copy-pasta
|
2020-08-21 14:37:51 -06:00 |
|
crobibero
|
384a62dc08
|
Add nullable int32, int64 json converters
|
2020-08-21 10:23:47 -06:00 |
|
Patrick Barron
|
98ed90c4a2
|
Merge branch 'master' into event-rewrite-1
|
2020-08-19 18:11:17 -04:00 |
|
Patrick Barron
|
a77cf53573
|
Allow plugins to register services.
|
2020-08-16 17:25:14 -04:00 |
|
Patrick Barron
|
98cbf1c2de
|
Migrate ActivityLogEntryPoint.OnPackageInstallationFailed to IEventConsumer
|
2020-08-14 15:56:54 -04:00 |
|
crobibero
|
64ace58ef5
|
fix docs
|
2020-08-14 08:34:32 -06:00 |
|
crobibero
|
64658a0bd0
|
Return int64 in json as number
|
2020-08-14 08:23:23 -06:00 |
|
David
|
4ea412f2ab
|
Fix remote images
|
2020-08-05 21:57:01 +02:00 |
|
crobibero
|
f915c3e5d9
|
Merge remote-tracking branch 'upstream/master' into api-migration
|
2020-08-03 11:24:13 -06:00 |
|
Bond-009
|
ab9c1295ce
|
Merge pull request #3538 from Ullmie02/api-fix
Fix value parsing in Jellyfin.Api
|
2020-07-23 10:37:30 +02:00 |
|
Bond-009
|
89ff865d40
|
Merge pull request #3508 from BaronGreenback/nullable
Part 1: nullable Emby.DLNA
|
2020-07-22 18:41:58 +02:00 |
|
crobibero
|
1385064497
|
Merge remote-tracking branch 'upstream/master' into api-migration-merge
|
2020-07-20 14:28:33 -06:00 |
|
BaronGreenback
|
301ddc1dac
|
Update HttpContextExtensions.cs
|
2020-07-19 22:19:17 +01:00 |
|
BaronGreenback
|
7becef73df
|
Update MediaBrowser.Common/Extensions/HttpContextExtensions.cs
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
|
2020-07-19 17:54:29 +01:00 |
|
BaronGreenback
|
69ba385782
|
Corrected comment
|
2020-07-18 16:55:46 +01:00 |
|
BaronGreenback
|
f9b0816b80
|
Changes a suggested.
|
2020-07-18 16:54:23 +01:00 |
|
Patrick Barron
|
4742ddbb71
|
Update .NET Core to 3.1.6
|
2020-07-17 19:48:11 -04:00 |
|
BaronGreenback
|
e33c6f6b29
|
Update IApplicationHost.cs
|
2020-07-17 12:54:55 +01:00 |
|
David
|
c6a0306a34
|
Move field to the controller
|
2020-07-14 20:20:24 +02:00 |
|
David
|
9f567e6471
|
Don't recreate JsonSerializerOptions every time
|
2020-07-14 12:39:58 +02:00 |
|
David
|
ee03b919f9
|
Fix parsing
|
2020-07-12 20:11:59 +02:00 |
|
BaronGreenback
|
ab10f21027
|
Part 1 of a multi-PR change for Emby.DLNA
|
2020-07-05 17:47:23 +01:00 |
|
Patrick Barron
|
fe02c6e863
|
Merge pull request #2929 from crobibero/api-scheduled-tasks
Scheduled Tasks to Jellyfin.Api
|
2020-06-25 23:46:03 +00:00 |
|
dkanada
|
4e08876028
|
Merge pull request #3418 from Bond-009/minor3
Minor changes
|
2020-06-23 16:56:44 +09:00 |
|
Bond-009
|
3d42f37538
|
Minor changes
|
2020-06-22 15:35:53 +02:00 |
|
Bond-009
|
464066f362
|
Merge pull request #3411 from neilsb/system-plugin-removal
Prevent system plugins from being uninstalled
|
2020-06-22 15:23:35 +02:00 |
|
dkanada
|
552a358c9c
|
Merge pull request #3244 from jellyfin/custom-repos
Initial implementation for custom plugin repositories
|
2020-06-22 22:08:43 +09:00 |
|
Neil Burrows
|
0bab57ebbc
|
Wrapping long line on function parameters (take 2)
|
2020-06-22 11:56:18 +01:00 |
|
Neil Burrows
|
966ebfaf68
|
Wrapping long line on function parameters
|
2020-06-22 11:53:15 +01:00 |
|
Neil Burrows
|
c20400fa40
|
Prevent system plugins from being uninstalled
|
2020-06-22 10:13:28 +01:00 |
|
Cody Robibero
|
43221fc26b
|
Merge branch 'master' into SSDP
|
2020-06-20 15:33:13 -06:00 |
|
David
|
6651cb8d24
|
Add JsonInto32Converter
Add additional swagger type mapping
|
2020-06-19 12:24:39 +02:00 |
|
dkanada
|
f5d82441a4
|
Merge branch 'master' into custom-repos
|
2020-06-17 02:09:32 +09:00 |
|
dkanada
|
6db1878011
|
Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
|
2020-06-15 10:55:33 +09:00 |
|
crobibero
|
39376bace3
|
Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks
|
2020-06-13 15:06:07 -06:00 |
|
crobibero
|
ec3e15db57
|
Fix merge and build
|
2020-06-13 13:11:41 -06:00 |
|
crobibero
|
829eb1a849
|
merge master into api-migration
|
2020-06-13 13:03:09 -06:00 |
|
crobibero
|
5b6e8fb22c
|
Remove whitespace
|
2020-06-12 06:53:47 -06:00 |
|
Cody Robibero
|
4c0dd10fb3
|
Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs
Co-authored-by: aled <aled@wibblr.com>
|
2020-06-11 16:21:53 -06:00 |
|
BaronGreenback
|
306f7b3c30
|
Update INetworkManager.cs
|
2020-06-11 23:10:13 +01:00 |
|
BaronGreenback
|
2cecde658b
|
Update INetworkManager.cs
Editting comments - adding periods
|
2020-06-11 22:58:29 +01:00 |
|
crobibero
|
30609c848b
|
Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter
|
2020-06-11 10:51:47 -06:00 |
|
crobibero
|
a6815018dc
|
Update to .NET Core 3.1.5
|
2020-06-11 07:13:56 -06:00 |
|
crobibero
|
6c53e36ccf
|
Fix Api Routing
|
2020-06-04 15:17:05 -06:00 |
|
crobibero
|
a787efc660
|
Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks
|
2020-06-04 15:16:04 -06:00 |
|
dkanada
|
b7f4b8e2b5
|
initial implementation for custom plugin repositories
|
2020-06-04 23:57:57 +09:00 |
|
Vasily
|
21505377d5
|
Merge pull request #3236 from Bond-009/common
Enable StyleCop for MediaBrowser.Common
|
2020-06-04 11:56:41 +03:00 |
|
crobibero
|
8b59934ccb
|
remove extra Clear call
|
2020-06-03 09:12:12 -06:00 |
|