diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-06 15:58:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-06 15:58:38 -0400 |
| commit | e42ef5c1817fb500b14c2eac4aa0ed765a6c6e64 (patch) | |
| tree | 6beddce4dffa97eb199da99867f6b493ce197e64 /MediaBrowser.Model | |
| parent | b0dd8c1b7542e0a7c0d58fa5bdca4e69ca174746 (diff) | |
| parent | 4764e3924773546d8db8c805d05990bbbfe44a7e (diff) | |
Merge pull request #2615 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Search/SearchQuery.cs | 10 |
3 files changed, 10 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index a924ad76e..838111a38 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -164,7 +164,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableAutomaticRestart { get; set; } public bool SkipDeserializationForBasicTypes { get; set; } - public bool SkipDeserializationForPrograms { get; set; } public bool SkipDeserializationForAudio { get; set; } public string ServerName { get; set; } diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index def47f645..75ba09b60 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -117,8 +117,6 @@ /// </summary> MediaSources, - OfficialRatingDescription, - OriginalTitle, /// <summary> diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs index 11d2d97f7..897a9db52 100644 --- a/MediaBrowser.Model/Search/SearchQuery.cs +++ b/MediaBrowser.Model/Search/SearchQuery.cs @@ -36,6 +36,16 @@ namespace MediaBrowser.Model.Search public string[] IncludeItemTypes { get; set; } public string ParentId { get; set; } + public bool? IsMovie { get; set; } + + public bool? IsSeries { get; set; } + + public bool? IsNews { get; set; } + + public bool? IsKids { get; set; } + + public bool? IsSports { get; set; } + public SearchQuery() { IncludeArtists = true; |
