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

116 Commits

Author SHA1 Message Date
Stephan
bcfb562dde Fix build after merge 2013-09-24 09:12:58 +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
6c32cf9529 Fix broken build 2013-09-23 17:30:09 +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
Stephan
c3caf7ff04 PublishedContent - align with v7, refactor IPublishedProperty & names 2013-09-19 13:12:18 +02:00
Stephan
f9cae9c4d8 PublishedContent - align with v7, refactor IPropertyValueConverter 2013-09-19 12:07:43 +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
371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-17 00:27:17 +10:00
Shannon
86a5d16e25 Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests. 2013-09-17 00:14:15 +10:00
Shannon
b043ee577f Renamed config interfaces properly with Section suffix, re-implemented the For<T> UmbracoConfiguration method to retreive specific settings... might use this entirely instead of the nested access as it might make it easier to mock. 2013-09-16 17:39:45 +10:00
Shannon
09b68a75be Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests 2013-09-16 15:52:59 +10:00
Stephan
d1af20424e merge branch '6.2.0' into '7.0.0' 2013-09-12 13:09:04 +02:00
Morten Christensen
8d510fd512 Committing some POC code in the test project for strongly typed models/queries 2013-09-11 10:16:49 +02:00
Shannon
e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
 2013-09-11 13:07:22 +10:00
Shannon
42c86a05b8 Completes U4-2390 Remove VersionID Guid in IPublishedContent properties 2013-09-10 17:37:10 +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
cf6a3cdfef A bunch more work done to convert the GUID -> alias for prop eds 2013-09-06 16:00:35 +10:00
Shannon
45dabd6293 Lots of work on U4-2722 Change Property Editors over to use unique alias instead of GUID 
it compiles but i haven't had time to test anything yet, will start all unit testing/fixing tomorrow, just needed to save this work somewhere.
 2013-09-05 18:38:54 +10:00
Morten Christensen
72dcb32ac2 Refactoring the TypedModelBase and UmbracoTempaltePage for the TypedModel POC 2013-09-04 15:42:25 +02:00
Morten Christensen
966416c0a5 Updating classes for small TypedModel POC 2013-09-04 11:30:21 +02:00
Morten Christensen
642c6c1afe Implementing a POC and tests for a simple TypedModel base class 2013-09-03 17:03:35 +02:00
Shannon
9fc3efd73a Fixes U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 11:59:07 +10:00
Sebastiaan Janssen
cc45bbeca6 Fix unit tests that failed because UmbracoSettings.config was being cleaned up 2013-08-23 16:22:26 +02:00
Shannon
d3b69e04e1 Updated IUserService and added more unit tests for new methods. Fixed unit tests that were failing due to incorrectly set settings... not sure how this is working on the server but oh well. 2013-07-03 19:01:37 +10:00
Sebastiaan Janssen
e93c910347 Fix more unit tests 2013-06-22 17:32:22 +02:00
Sebastiaan Janssen
7139e30296 Don't delete the config file directory, it can't sometimes 
For now, don't delete umbracoSettings.config either, it makes a lot of tests fail
 2013-06-22 15:53:10 +02:00
Sebastiaan Janssen
df1940a01c Fix unit test by ensuring config file is copied if it doesn't exist 2013-06-22 15:07:40 +02:00
Shannon Deminick
2201c644f7 Merge with 6.0.6 2013-05-12 21:49:38 -10:00
Shannon Deminick
822cac5d87 Adds test for #U4-2207 which will now pass but it will still fail on the website because of the case 
sensitive checking for the default proeprty editor lookup. Need feedback from sebastian before continuing
 2013-05-12 21:44:02 -10:00
Shannon Deminick
cfe6ac0486 Merge with 6.0.6 2013-05-07 18:57:39 -10:00
Shannon Deminick
c52669fb05 Fixes: #U4-2094 - issue with duplicates in getting Descendants for media in mvc. 2013-05-07 18:56:24 -10:00
Stephan
a1d5b61ae5 PublishedContent - create tests to illustrate issues 2013-04-24 11:56:32 -02:00
Shannon Deminick
3d76614a78 Merge with 4.11.7 2013-04-02 21:31:21 +06:00
Shannon Deminick
a638488eb7 Fixes unit tests which require the ApplicationContext.Current singleton to be setup 2013-04-01 23:30:19 +06:00
Stephan
c5b6bb52e0 Web.PublishedCache - refactor how caches manage preview 2013-03-31 18:47:25 -02:00
Stephan
9982a09826 Web.PublishedCache - merge resolvers so caches can be related 2013-03-31 18:40:55 -02:00
Stephan
f2d7e3549d XmlPublishedCache - fix casting exception messages 2013-04-04 15:24:29 -02:00
Shannon Deminick
a7e939e71f Merge with 6.0.4 2013-04-02 22:39:39 +06:00
Stephan
47474d31d6 Web.PublishedCache - rename LegacyXmlCache into XmlPublishedCache 2013-03-22 15:02:26 -01:00
Stephan
73d77083ae Web.PublishedCache - bugfix & fix tests 2013-03-19 17:54:41 -01:00
Stephan
b2a1f67fb4 Web.PublishedCache - move XML away from UmbracoContext 2013-03-19 17:54:41 -01:00
Stephan
ce0c72d9f8 Web.PublishedCache - introduce contextual caches 2013-03-19 17:51:55 -01:00
Shannon Deminick
82d645a0f7 Merge with 4.11.6 2013-03-05 22:18:53 +06:00
Shannon Deminick
a765f36d24 Adds unit tests for DynamicNode and DynamicPublishedContent, fixes both when querying for recursive properties. 
Fixes: #U4-1839
 2013-03-05 21:00:16 +06:00
Shannon Deminick
b5cbe63a4e Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 02:43:22 +06:00
Shannon Deminick
4882df43bd Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 01:50:53 +06:00
Shannon Deminick
d68b4d97f6 Fixing merge issues 2013-02-22 06:43:52 +06:00
Shannon Deminick
96a62b57fb Merge with 4.11.5 2013-02-22 06:21:12 +06:00