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

85 Commits

Author SHA1 Message Date
Stephan
4b36dcc13b Fix bug after merge 2013-10-11 12:28:31 +02:00
Stephan
69367e0cda Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 10:24:24 +02:00
Stephan
671b94dd06 PublishedContentModel - keep it internal for now 2013-10-11 09:24:26 +02:00
Stephan
19784e04bf Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
 2013-10-02 17:42:59 +02:00
Stephan
06206c60d9 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-02 17:06:46 +02:00
Stephan
f64b8d680d Core.StringExtensions - switch over to the new DefaultShortStringHelper 2013-10-02 16:54:56 +02: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
d925f856ae Take care of FIXMEs 2013-09-23 16:55:59 +02:00
Stephan
3de2196e01 PublishedContent - reorg. existing IPropertyValueConverter impl. 2013-09-23 16:42:35 +02:00
Shannon
c0a303b328 Gets macro editor working with new db changes and using new MacroService data layer 2013-09-19 17:34:57 +10:00
Stephan
08566f32de Take care of more FIXMEs 2013-09-18 10:09:05 +02:00
Stephan
85cb7fadfc PublishedContent - implement a model factory 2013-09-16 17:17:48 +02:00
Stephan
0415a31d0e PublishedContent - the big refactoring 2013-09-16 17:17:45 +02:00
Shannon
719b921e0b Created the maps for all core property editors to map from legacy GUID to new alias with unit tests. 2013-09-09 15:57:22 +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
cb368b4335 Implemented the numeric property editor 2013-08-28 13:30:05 +10:00
Shannon
3708b0de65 Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string 2013-08-26 18:03:35 +10:00
Shannon
75ceb539b4 Streamlines cache helper ctor's 2013-08-09 11:37:57 +10:00
Shannon
4b8fed9f06 Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well. 2013-07-25 15:31:26 +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
24111c52f2 Obsoleted umbraco.businesslogic.ApplicationTree, have moved logic and new classes to core and proxied calls from it to the new ones. The new ApplicationTreeCollection will be the runtime colleciton of trees which can also read/write/save to the xml. 2013-06-20 10:05:51 +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 Deminick
0f5d61bae8 Started importing classes and functionality from the Belle project so we can start wiring up data. 2013-05-23 22:15:52 -10:00
Morten Christensen
f26e39f5ce Adding a new extensibility in relation to #U4-2244 which allows consumers of the CoreBootManager to explicitly set the path to the root of an umbraco site/solution. 
A bit of cleanup in the IOHelper class.
 2013-05-22 07:48:42 -02:00
Shannon Deminick
2f16e6662d updates disposable timer to ensure it also outputs to HttpTrace if there is one. 2013-05-14 13:39:55 -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
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
Sebastiaan Janssen
e4e0bcf642 Correct spelling error 2013-04-16 04:27:03 -02:00
Morten Christensen
efbc461da9 Code cleanup - removing all internal code related to Macros, which was created for v6 but left out for backwards compatibility. 2013-04-07 17:47:10 -02:00
Stephan
21c635f61a Core.Strings - Add support for UrlReplaceCharacters to DefaultShortStringHelper 2013-03-22 17:39:35 -01:00
Shannon Deminick
75d218d2e3 Updated how mappers for persistence work with the MapperFor attribute and have made BaseMapper public but have 
kept all properties, etc.. internal just so that they can be found so we don't have to register them.
Updates unit test to ensure the plugin manager is init'd properly with the 'false' override. Ensures that the base
db test also initializes the plugin manager properly.
 2013-03-13 01:09:29 +04: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
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
9bd865d259 Fixes: #U4-1890 - allows access to the UmbracoContext during application startup. 2013-03-11 23:46:47 +06:00
Shannon Deminick
1e6de161e6 Merge with 6.0.3 2013-03-11 22:01:40 +06:00
Shannon Deminick
4baecfe833 Merge with 6.0.3 2013-03-11 21:56:47 +06:00
Morten Christensen
cb0dd70434 Minor change to the SqlSyntaxProvidersResolver in the CoreBootManager as per Shannons review. 2013-03-11 12:44:12 -01:00
Morten Christensen
928d92fce4 Making the Sql Syntax Providers public and changing a few names and bits for consistency. 
Adding resolver for the syntax providers and wiring it up in the boot manager.
 2013-03-09 10:43:34 -01:00
Shannon Deminick
36108df4d0 Merge with 6.0.2 2013-03-02 02:49:24 +06:00
Morten Christensen
c38c18fed8 Adding migration for updating PropertyGroups and PropertyTypes 2013-02-28 14:54:42 -01:00
Stephan
a995c9557c Core.Strings - new IUrlSegmentProvider 2013-02-18 08:31:00 -01:00
Shannon Deminick
598d66ac7f Imports patch to fix: #U4-1718 2013-02-14 23:14:43 +06:00
Stephan
a0f662c114 Core.Strings - refactor + new IShortStringHelper 2013-02-07 13:30:50 -01:00