diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-05-06 20:31:58 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-05-06 20:31:58 -0700 |
| commit | 024d4f3a99fce8cf8005f9851bbf0437c241fbbc (patch) | |
| tree | 6d3b9654315669ebd70ff17d57fb953c9d00e4f0 /MediaBrowser.Model | |
| parent | 3f433b3b618d2a955441596cac1a9e30a5d6c070 (diff) | |
| parent | 3517d1d5f0d02925eea22af1101480bee8726dd4 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/DTO/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MetadataProviders.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs index e8f389940..076fa7bfc 100644 --- a/MediaBrowser.Model/DTO/BaseItemDto.cs +++ b/MediaBrowser.Model/DTO/BaseItemDto.cs @@ -277,6 +277,12 @@ namespace MediaBrowser.Model.Dto public string[] IndexOptions { get; set; } /// <summary> + /// Gets or sets the tags. + /// </summary> + /// <value>The tags.</value> + public List<string> Tags { get; set; } + + /// <summary> /// Gets or sets the primary image aspect ratio. /// </summary> /// <value>The primary image aspect ratio.</value> diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs index 15648604f..3c7b2ff01 100644 --- a/MediaBrowser.Model/Entities/MetadataProviders.cs +++ b/MediaBrowser.Model/Entities/MetadataProviders.cs @@ -29,6 +29,10 @@ namespace MediaBrowser.Model.Entities /// <summary> /// The rotten tomatoes /// </summary> - RottenTomatoes + RottenTomatoes, + /// <summary> + /// Tmdb Collection Id + /// </summary> + TmdbCollection } } diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index 2e6e6b7dc..875329c70 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -132,6 +132,11 @@ namespace MediaBrowser.Model.Querying Taglines, /// <summary> + /// The tags + /// </summary> + Tags, + + /// <summary> /// The trailer url of the item /// </summary> TrailerUrls, |