yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,362 Commits 4 Branches 7 Tags
1902bc480762bf0ae9eddd4c4e337aca97284b86
Commit Graph

124 Commits

Author SHA1 Message Date
Stephan
1902bc4807 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-03 18:17:35 +02:00
Shannon
2ed4206f93 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-10-03 09:01:24 +10: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
36d6e4b4da Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2013-09-26 08:57:01 +02:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Stephan
3ca8b356ee Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedItemType.cs
	src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
	src/Umbraco.Core/PublishedContentExtensions.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
	src/Umbraco.Tests/LibraryTests.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
	src/Umbraco.Web/ExamineExtensions.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
 2013-09-23 21:57:22 +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
Shannon
f38a6e1561 Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part. 2013-09-13 18:11:20 +10:00
Shannon
26a47e7ee1 Updated the published conversion process with the new PropertyValueConverter and migrated the old core IPropertyEditorValueConverters to the new format. 2013-09-09 15:17:33 +10:00
Shannon
7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
Shannon
733b6aa945 Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes 2013-08-29 17:14:34 +10:00
Shannon
89324370b4 Completes U4-2415 Remove legacy RestExtensions and restExtensions.config 2013-08-29 15:50:48 +10:00
Shannon
b8ff20073a Completed U4-2741 Removed un-used obsoleted code in namespace umbraco.presentation.cache 2013-08-29 15:23:43 +10:00
Shannon
f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2013-08-29 15:18:19 +10:00
Shannon
c53c644868 Completes U4-2740 Remove un-used legacy classes from namespace "umbraco" 2013-08-29 15:14:12 +10: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
75ceb539b4 Streamlines cache helper ctor's 2013-08-09 11:37:57 +10:00
Shannon
dcf730a1bc ensures the ui cultures are set in the back office. adds WebSecurity as a dependency for UmbracoContext. 2013-07-31 18:21:27 +10:00
Shannon
3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Shannon
816edce620 Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings. 2013-06-18 17:22:01 +10:00
Shannon
feeba0e6f9 Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:47:56 +10:00
Shannon
273c1956ab Fixes: #U4-2343 for api controllers, already fixed for surface controllers 2013-06-18 15:46:36 +10:00
Shannon
93fa4c0447 Merge branch '6.1.2' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Web/Mvc/BackOfficeArea.cs
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:28:37 +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
47d70e858b Getting media picker working 2013-06-10 10:36:59 -02:00
Shannon Deminick
34cb8ea633 Changed back office routes to use a proper MVC area and ensures that the controller creations for all controllers are limited 
to ONLY look in the namespaces declared for them, this will increase performance and ensure there's not conflicting controller
creation... need to back port this to 6.0.x
 2013-06-03 21:38:43 -10:00
Shannon Deminick
160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled 
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
 2013-05-30 21:21:52 -10:00
Shannon Deminick
03f64521cb updated sln to have a simple website project in the Umbraco.UI.Client folder which will be the Belle development folder, its a website so it doesn't compile or anythng 
just a space to be able to edit files. We can probably also update it to launch IIS Express to point to the build folder for testing. Moved the back office
scripts controller actions just to the normal back office controller. Tweaked some of the Belle POC so now it is loading and have created an index.html
file which contains all the belle stuff so people won't have to worry about the container razor file.
 2013-05-29 20:25:29 -10:00
Shannon Deminick
cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct 
paths.
 2013-05-27 01:23:49 -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