jellyfin/MediaBrowser.Api
Erwin de Haan 49b61f238e Merge branch 'dev' into reformat
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
..
Devices Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Images ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Library ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
LiveTv ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Movies Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Music Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Playback ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Properties Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
ScheduledTasks ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Session ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Subtitles Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
System Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
UserLibrary ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
ApiEntryPoint.cs ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
BaseApiService.cs ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
BrandingService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
ChannelService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
ConfigurationService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
DisplayPreferencesService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
EnvironmentService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
FilterService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
GamesService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
IHasDtoOptions.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
IHasItemFields.cs ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
ItemLookupService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
ItemRefreshService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
ItemUpdateService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
LocalizationService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
MediaBrowser.Api.csproj Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
PackageService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
PlaylistService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
PluginService.cs Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
SearchService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
SimilarItemsHelper.cs ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
StartupWizardService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
SuggestionsService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
TvShowsService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
UserService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
VideosService.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00