github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 18:57:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of git://github.com/kayone/NzbDrone

Browse source 
Conflicts:
	NzbDrone.Core/Providers/MediaFileProvider.cs
This commit is contained in:
Mark McDowall 2011-06-04 11:47:35 -07:00
commit 383dfe302f
37 changed files with 377 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NzbDrone.Web/Models/SeasonEditModel.cs
View file

@ -7,7 +7,7 @@ namespace NzbDrone.Web.Models
{
public class SeasonEditModel
{
public int SeasonId { get; set; }
public int SeriesId { get; set; }
public int SeasonNumber { get; set; }
public string SeasonString { get; set; }
public bool Monitored { get; set; }

3
NzbDrone.Web/Models/SeriesModel.cs
View file

@ -19,7 +19,8 @@ namespace NzbDrone.Web.Models
public string QualityProfileName { get; set; }
public string Overview { get; set; }
public int Episodes { get; set; }
public int EpisodeTotal { get; set; }
public IList<int> Seasons { get; set; }
//View & Edit
[DisplayName("Path")]