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

..

_bin_deployableAssemblies

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

App_Start

Fixed post build steps

2012-12-24 19:46:52 -08:00

Content

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

Controllers

Free space widgets

2012-12-23 23:16:43 -08:00

Fakes

Upgraded nuget packages, Ninject 3, SignalR 5

2012-11-03 11:23:47 -07:00

FakesAssemblies

Adding works!

2012-12-10 20:39:35 -08:00

Filters

Mass edit is now Series Editor.

2012-02-23 14:31:50 -08:00

Helpers

Binders full of women are no longer ignored

2012-11-13 17:14:27 -08:00

Models

Added nzbx to UI

2012-12-22 11:44:47 -08:00

Properties

Fixed up tests

2012-09-10 23:35:25 -07:00

Scripts

Fixed autocomplete issues

2012-12-18 18:30:10 -08:00

Views

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

favicon.ico

Package cleanup

2012-02-10 16:48:20 -08:00

Global.asax

Initial Commit

2010-09-22 20:19:47 -07:00

Global.asax.cs

Fixed SignalR - Its FM!

2012-12-18 17:40:47 -08:00

log.config

Log file is off by default.

2011-11-13 16:23:49 -08:00

NzbDrone.Web.csproj

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

NzbDrone.Web.ncrunchproject

Tests added

2012-07-12 11:30:43 -07:00

packages.config

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

Web.config

Merge branch 'master' into backbone

2012-12-24 21:53:45 -08:00

Web.Debug.config

Initial Commit

2010-09-22 20:19:47 -07:00

Web.Release.config

updated web.config transform

2011-10-25 22:06:45 -07:00