sonarr-repo-only/NzbDrone.Web/Views/Settings
Mark McDowall f3809d3a80 Merge branch 'master' into backbone
Conflicts:
	NzbDrone.Common/packages.config
	NzbDrone.Core.Test/packages.config
	NzbDrone.Core/NzbDrone.Core.csproj
	NzbDrone.Core/packages.config
	NzbDrone.Services/NzbDrone.Services.Service/packages.config
	NzbDrone.Web.UI.Test/NzbDrone.Web.UI.Automation.csproj
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/README_ENU.txt
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/msvcr90.dll
	NzbDrone.Web/_bin_deployableAssemblies/amd64/sqlceme40.dll
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/README_ENU.txt
	NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/msvcr90.dll
	NzbDrone.Web/_bin_deployableAssemblies/x86/sqlceme40.dll
	NzbDrone.Web/packages.config
2012-12-24 21:53:45 -08:00
..
Blackhole.cshtml More validation for Settings. 2012-02-25 14:21:07 -08:00
DownloadClient.cshtml Fixed scripts on DownloadClient settings 2012-11-06 17:06:19 -08:00
EpisodeNamingPartial.cshtml Moved Use Scene Name to top of checkboxes 2012-08-03 08:18:21 -07:00
Growl.cshtml More validation for Settings. 2012-02-25 14:21:07 -08:00
Indexers.cshtml Added nzbx to UI 2012-12-22 11:44:47 -08:00
MetadataPartial.cshtml Added metadata options to settings #ND-21 2012-07-12 19:02:30 -07:00
Misc.cshtml Allow sorting with articles (option) 2012-12-20 21:36:48 -08:00
Naming.cshtml Remove AJAX tabs for settings pages 2012-10-14 17:50:01 -07:00
NewznabProvider.cshtml Fixed newznab close icon 2012-12-06 21:48:34 -08:00
Notifications.cshtml Remove AJAX tabs for settings pages 2012-10-14 17:50:01 -07:00
Plex.cshtml Test buttons for Plex 2012-10-21 21:29:12 -07:00
Pneumatic.cshtml Pneumatic added to client side 2012-08-29 19:33:57 -07:00
Prowl.cshtml New: Added test button to SABnzbd. 2012-03-17 21:14:32 -07:00
Quality.cshtml Fixed up UI changes when model is edited 2012-12-10 22:45:52 -08:00
QualityProfileItem.cshtml Added WEBDL 1080p 2012-10-14 21:30:07 -07:00
Sabnzbd.cshtml Renamed some settings, added 2nd priority for sab 2012-11-22 18:56:27 -08:00
Smtp.cshtml Reordered notification accordions. 2012-02-26 17:54:55 -08:00
System.cshtml Remove AJAX tabs for settings pages 2012-10-14 17:50:01 -07:00
Twitter.cshtml Moved from Tabs to Accordion for Notifiers 2011-11-29 16:45:45 -08:00
Xbmc.cshtml Test buttons for XBMC 2012-10-21 20:44:16 -07:00
_SettingsLayout.cshtml Added title to settings pages 2012-10-21 00:44:00 -07:00