1
0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-16 16:04:08 +01:00
Radarr/NzbDrone.Web/Views
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
..
AddSeries Fixed Remove Root Dir issue in Chrome 2012-10-29 08:30:37 -07:00
History Fixed URLs for AJAX loaded grids 2012-10-24 08:09:42 -07:00
Log Reverted AJAX Binding for logs 2012-10-23 08:10:23 -07:00
Missing DateTime.ToString fixes for other countries 2012-12-05 17:54:09 -08:00
SearchHistory Search History Force Download 2012-11-18 18:39:16 -08:00
Series Removed ignore relative urls 2012-10-28 12:15:56 -07:00
Settings Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Shared Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
System Merge remote-tracking branch 'origin/dynamic-jobs' 2012-10-19 08:39:07 -07:00
Upcoming Font-Awesomed Missing and History 2012-10-10 19:59:35 -07:00
Update Fixed issue with loading update page when there is no update available. 2012-02-29 18:53:27 -08:00
_ViewStart.cshtml EpisodesWithoutFiles will ignore episodes with an air date before 1900. 2011-06-01 16:18:08 -07:00
Web.config Good bye Telerik, Hello jQuery 1.7 2012-02-09 23:37:31 -08:00