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

Conflicts:
	NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml
This commit is contained in:
Mark McDowall
2011-04-07 17:00:42 -07:00
66 changed files with 19480 additions and 1705 deletions
@@ -7,7 +7,7 @@
@{Html.Telerik().ComboBox()
.Name("seriesList_" + ViewData["guid"].ToString())
.BindTo(Model)
.DataBinding(binding => binding.Ajax().Select("_textLookUp", "AddSeries").Delay(400).Cache(false))
.DataBinding(binding => binding.Ajax().Select("_textLookUp", "AddSeries").Delay(400))
.Filterable(f => f.FilterMode(AutoCompleteFilterMode.Contains))
.HighlightFirstMatch(true)
.HtmlAttributes(new { style = "width: 300px;" })