kay.one 6f73260ab7 Merge branch 'markus101' ...

Conflicts:
	NzbDrone.Web/NzbDrone.Web.csproj
	NzbDrone.Web/Views/Log/Index.cshtml

2011-04-21 21:03:59 -07:00

..

App_GlobalResources

Upgraded to MVC3, Hello Razor.

2011-03-29 23:18:35 -07:00

Content

RAZOR'd Log & Upcoming.

2011-04-20 23:18:28 -07:00

Controllers

Merge branch 'markus101'

2011-04-21 21:03:59 -07:00

Helpers

ReSharper code cleanup

2011-04-09 19:44:01 -07:00

Libraries

Upgraded to MVC3, Hello Razor.

2011-03-29 23:18:35 -07:00

Models

New UI for Indexer Settings, RAZOR!

2011-04-19 16:46:21 -07:00

Properties

ReSharper code cleanup

2011-04-09 19:44:01 -07:00

Scripts

Updated jQuery to 1.5.2 now using NuGet

2011-04-18 19:05:00 -07:00

Views

Merge branch 'markus101'

2011-04-21 21:03:59 -07:00

favicon.ico

added favicon.ico

2011-03-28 22:50:18 -07:00

Global.asax

Initial Commit

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

Global.asax.cs

Added asp.net tick timer

2011-04-21 19:23:31 -07:00

log.config

Added asp.net tick timer

2011-04-21 19:23:31 -07:00

NzbDrone.Web.csproj

Merge branch 'markus101'

2011-04-21 21:03:59 -07:00

NzbDrone.Web.csproj.orig

Merge branch 'markus101'

2011-04-21 21:03:59 -07:00

NzbDrone.Web.Publish.xml

Added asp.net tick timer

2011-04-21 19:23:31 -07:00

packages.config

Updated jQuery to 1.5.2 now using NuGet

2011-04-18 19:05:00 -07:00

Web.config

Updated Exceptioneer.

2011-04-04 19:59:33 -07:00

Web.Debug.config

Initial Commit

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

Web.Release.config

Initial Commit

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