Commit Graph

100 Commits

Author SHA1 Message Date
Stephan a264342bcc Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
2013-10-03 18:16:29 +02:00
mortenbock 24020cfea3 Make sure the profilingengine doesn't wrap itself 2013-10-02 18:30:59 +02:00
mortenbock 9ec30860b0 Wrap all ViewEngines in a profiler
Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
2013-10-02 17:48:44 +02:00
Stephan 3de2196e01 PublishedContent - reorg. existing IPropertyValueConverter impl. 2013-09-23 16:42:35 +02:00
Stephan 0415a31d0e PublishedContent - the big refactoring 2013-09-16 17:17:45 +02:00
Stephan 3fc4f36859 U4-2549 - fix issue with last chance content finder
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-28 18:16:20 +02:00
Shannon 273c1956ab Fixes: #U4-2343 for api controllers, already fixed for surface controllers 2013-06-18 15:46:36 +10:00
Shannon f7c474ac2c fixed merge issue and ensures UseNamespaceFallback are set for plugin controllers. 2013-06-18 15:24:44 +10:00
Shannon 4143dbd02d Fixed some merge issues 2013-06-18 15:20:18 +10:00
Shannon 768eb3d1ed Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
	src/Umbraco.Web/Mvc/PluginControllerArea.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
2013-06-18 15:13:43 +10:00
Shannon a5041aa34e Backported changes to use a real Area to do Umbraco area routes and updates our extension methods with the UseNamespaceFallback data token to only check in one namespace. 2013-06-18 14:59:00 +10:00
Shannon Deminick 5890fe1849 Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling. 2013-05-13 21:11:03 -10:00
Shannon Deminick b6f52bf782 Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly.
Added an HtmlHelper extension which is used to render the profiler html output.
Added an HtmlHelper property to the new base page too.
2013-05-13 20:10:28 -10:00
Shannon Deminick cb8d080f1d Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
2013-05-12 19:05:49 -10:00
Shannon Deminick 09a6cdc8b6 Removed all MiniProfile calls that were trying to be simple trace messages (not actually profiling). This doesn't actually
work since MiniProfiler was not meant for that and won't actually output them unless you add Thread.Sleep statements into the using
clauses simply to slow down the application, not ideal. Updated the WebProfiler to log a statement when in medium trust.
2013-05-12 18:06:26 -10:00
Shannon Deminick 67b57dea50 Changes profiler over to use a resolver and uses an interface for it. Changes core over to use a
LogProfiler and the web project to use a web profiler (MiniProfiler). Fixes medium trust implementation,
adds performance check for binding to begin request, changes Web profiler over to be decoupled from the
umbraco application objects (binds to events by itself)
2013-05-12 15:25:46 -10:00
Shannon Deminick 577d77cfab Fixes: #U4-1760 - allows a developer to set the default RenderMvcController on startup. 2013-04-28 16:09:24 -10:00
Sebastiaan Janssen 2e39c55d56 Merge 2013-04-16 04:27:44 -02:00
Sebastiaan Janssen e4e0bcf642 Correct spelling error 2013-04-16 04:27:03 -02:00
Shannon Deminick 1e7e670df3 Fixes #U4-2104 - namespace issue with UmbracoApiControllers 2013-04-15 21:44:26 +06:00
Stephan 9982a09826 Web.PublishedCache - merge resolvers so caches can be related 2013-03-31 18:40:55 -02:00
Stephan 47474d31d6 Web.PublishedCache - rename LegacyXmlCache into XmlPublishedCache 2013-03-22 15:02:26 -01:00
Stephan fcb8f0d417 Web.Routing - RoutesCache goes with PublishedCache 2013-03-20 16:01:49 -01:00
Shannon Deminick 2fdcb9164a Fix merge issues 2013-03-12 00:19:06 +04:00
Shannon Deminick 7404a1f93d Merge with 4.11.6 2013-03-12 00:14:50 +04:00
Shannon Deminick c8b8b28e9b applies patch for #U4-1890 2013-03-12 00:10:59 +04:00
Shannon Deminick c0cd157e60 applies patch for #U4-1890 2013-03-12 00:00:55 +04:00
Shannon Deminick 7b2f03ba50 Merge with 4.11.5 2013-02-19 06:20:12 +06:00
Shannon Deminick 12f8638223 Fixes: #U4-1727 2013-02-19 06:18:51 +06:00
Shannon Deminick 7d1e9cfd72 Fixes: #U4-1727 2013-02-19 06:11:17 +06:00
Shannon Deminick c21b232a33 Merge with 4.11.5 2013-02-14 23:34:58 +06:00
Shannon Deminick ef86d2f1f1 Manually applies patch for #U4-1718 2013-02-14 23:26:29 +06:00
Stephan 683d793460 U4-1441 - refactor (fix) legacy NotFoundHandler support 2013-02-06 12:46:54 -01:00
Stephan ef9ce720b2 Web.PublishedCache - create, migrate 2013-02-05 06:31:13 -01:00
Shannon Deminick 2dea4a1d70 updates more cache handling, fixes syntax error in examineindex.release.config, fixes the DefaultServerMessenger ctor
to be lazy since the db context isn't initialized yet (will speed up start a bit too), ensures that the macro/xslt caching
clearing is only done on the single server instead or re-posing another distributed call.
2013-03-16 01:37:05 +06:00
Stephan ac3bec5d9e Web.Routing - refactor domains management 2013-02-19 06:37:25 -01:00
Stephan da7fea47c6 U4-1441 - refactor (fix) legacy NotFoundHandler support 2013-02-03 14:34:04 -01:00
Shannon Deminick 1da27e6c2b Removes all upgrade script stuff since we've deployed the fix in a package. 2013-02-01 06:42:42 +06:00
Shannon Deminick bea6031de1 Removes UpgradeScripts stuff from 4.11.4 ... now to go remove it from there too since I've moved the script to a package. 2013-02-01 06:34:28 +06:00
Shannon Deminick 3608242b25 Merge with 4.11.4 2013-02-01 06:22:28 +06:00
Stephan 8b00e72bf6 Web.Routing - refactor url providing (U4-1321...) + new IUrlProvider 2013-01-31 10:06:25 -01:00
Shannon Deminick cc50003e3e Fixup merge issues 2013-03-12 00:40:37 +04:00
Shannon Deminick 8698deb469 Merge with 6.0.3 2013-03-12 00:21:10 +04:00
Shannon Deminick 9bd865d259 Fixes: #U4-1890 - allows access to the UmbracoContext during application startup. 2013-03-11 23:46:47 +06:00
Shannon Deminick 6815092b62 Changed default api routes to support multiple actions, not strict REST only methods. updated more examine mgmt. 2013-02-27 06:50:26 +06:00
Shannon Deminick 7c32365bd3 moved web api controllers to namespace Umbraco.Web.WebApi and created web api member authorize attribute 2013-02-26 22:14:32 +06:00
Shannon Deminick 63159702e3 Implemented UmbracoApiController as a plugin and is auto routed 2013-02-26 03:45:39 +06:00
Shannon Deminick 2e033b3bb6 Merge 2013-02-19 07:32:57 +06:00
Shannon Deminick d8721197b7 Fixes up pull request so that there is no breaking changes. We now type check for a new base class called
UmbracoControllerFactory to get the controller type. Adds SurfaceRouteHandler to ensure that UmbracoMvcHandler is used for all SurfaceControllers, and updates
all routes accordingly. Streamlines the RenderRouteHandler to then just look up surface routes in the route table
for posted values. This now ensures that UmbracoMvcHandler is used even with plugin surface controllers.
2013-02-19 07:30:46 +06:00
Shannon Deminick 4a05b0ea31 Merge with 6.0.1 2013-02-19 06:20:48 +06:00