| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ConventionController/Views/Shared/Rescues/DivideByZeroException.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ConventionController/Controllers/ShipmentController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/Attributes/RescueAttribute.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/ASPXViewEngine/AutoTypeViewPageTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/ValidationHelperTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/DefaultViewDataBinderTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.NHamlViewEngine/CompiledView.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Deleted |
Jeremy.Skinner |
/trunk/src/MVCContrib/ActionResults/JsonResult.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NinjectControllerFactory/MvcContrib.Samples.NinjectControllerFactory/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ViewFactories/NVelocityViewTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ConventionController/TestController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ViewFactories/HtmlExtensionDuckTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.FormHelper/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/bin/AspNetMvc/System.Web.Abstractions.dll |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/UI/ASPXViewEngine/AutoTypingHelper.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.TestHelper/MvcContrib.TestHelper/ActionResultHelper.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.Castle/HtmlExtensionDuck.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/IocControllerFactory/Website/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/HtmlGridTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.BrailViewEngine/Views/Home/contact.brail |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.UnityControllerFactory/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.TestHelper/Website/Views/Stars/ListWithLinks.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/BaseViewTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Models/ProductsViewData.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/XsltViewEngine/XsltViewTest.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/NHamlViewEngine/NHamlViewTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/BrailViewEngine/BooViewEngineTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Controllers/ProductsController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.WindsorControllerFactory/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/bin/AspNetMvc/System.Web.Mvc.dll |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/EmailTemplateServiceTest.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NVelocityViewFactory/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ViewDataExtensionsForViewDataTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ConventionController/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Deleted |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ActionResults/TextResultTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/UI/ASPXViewEngine/AutoTypeViewPage.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ConventionController/Views/Shipment/New.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.TestHelper/Sample.Test/StarsControllerTest.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/SimplyRestful/SimplyRestfulRouteHandler.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.IoC/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.BrailViewEngine/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.IoC.Spring/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/ViewDataExtensions.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.FormHelper/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/ConventionController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.WindsorControllerFactory/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/NHamlViewEngine/NHamlViewFactoryTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ObjectBuilderControllerFactory/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NinjectControllerFactory/MvcContrib.Samples.NinjectControllerFactory/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Deleted |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ActionResults/JsonActionResultTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.IoC/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.BrailViewEngine/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.BrailViewEngine/BrailBase.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.TestHelper/Website/Views/Stars/List.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.XsltViewEngine/XsltView.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.TestHelper/Website/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.NHamlViewEngine/NHamlViewFactory.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NVelocityViewFactory/Views/Home/contact.vm |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/MVCContrib.UnitTests.csproj |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ViewFactories/NVelocityHtmlHelperTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/ConventionController/ConventionControllerTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/ASPXViewEngine/AutoTypeViewUserControlTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/bin/AspNetMvc/System.Web.Routing.dll |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/IocControllerFactory/Website/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/IocControllerFactory/Website/Views/Home/Index.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.Castle/NVelocityHtmlHelper.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/FormHelperTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.UnityControllerFactory/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Views/Products/List.haml |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/UI/ASPXViewEngine/AutoTypeViewUserControl.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.Castle/NVelocityView.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ObjectBuilderControllerFactory/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NVelocityViewFactory/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Deleted |
Jeremy.Skinner |
/trunk/src/MVCContrib/ActionResults/TextResult.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.XsltViewEngine/XsltViewFactory.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Views/Products/Edit.haml |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Controllers/HomeController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.ConventionController/Views/Shipment/Track.aspx |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.IoC.Spring/Web.config |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/ComponentControllerExtensionsTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/MVCContrib.csproj |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/TestHelper/TestHelperController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.NHamlViewEngine/NHamlView.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/BrailViewEngine/BrailViewFactoryTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Deleted |
Jeremy.Skinner |
/trunk/bin/AspNetMvc/AspNetMVCPreview2-setup.msi |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MvcContrib.NHamlViewEngine/INHamlView.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib/UI/Html/DefaultDataBinder.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/TestHelper/ActionResultHelperTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/UI/Html/SmartFormTester.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/MVCContrib.UnitTests/XsltViewEngine/XsltViewFactoryTest.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.TestHelper/Website/Controllers/StarsController.cs |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
| Modified |
Jeremy.Skinner |
/trunk/src/Samples/MvcContrib.Samples.NHamlViewEngine/Views/Products/New.haml |
Merging Preview 3 branch back into trunk. |
2008-05-30 11:18:33 |
