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

..

AngularIntegration

Fixes a unit test

2013-08-23 16:53:15 +02:00

Auditing

Adding unit test for saving bulk content, and adding lazy collection save overload.

2012-11-13 14:30:05 -01:00

BootManagers

Fixed up unit test

2013-05-14 13:50:16 -10:00

BusinessLogic

Fixes: U4-2642 Make SQL CE more resilient to server crashes

2013-08-19 12:26:01 +02:00

Cache

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

CodeFirst

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

Configurations

Changes default UrlProviderMode to AutoLegacy, fixes a few unit tests, adds ability to set Set<T> for UmbracoConfiguration for testing. Fixes razor static mapping section template.

2013-09-17 10:55:04 +10:00

Controllers/WebApiEditors

Fixes merge issues... but now have to fix all the unit tests

2013-09-18 13:26:09 +10:00

CoreStrings

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

CoreXml

PublishedContent - the big refactoring

2013-09-16 17:17:45 +02:00

DynamicsAndReflection

Take care of FIXMEs

2013-09-23 16:55:59 +02:00

Integration

Make Selenium Contour install work

2013-04-25 08:44:01 -02:00

IO

Updated SettingsForTest to return mockable umbraco settings so we can set whatever we want. Fixing up unit tests. Removes calls to CleanUmbracoSettingsConfig and EnsureUmbracoSettingsConfig since we should be dealing with the mockable settings.

2013-09-16 19:33:21 +10:00

LegacyApi

Updated references to the new constants for Application and MediaType aliases.

2013-03-22 13:13:05 +00:00

Macros

Have the RTE insert macro stuff working, needs a few tweaks and needs to load content but its working. YOU NEED A FULL BRAND NEW DB RE-INSTALL FOR THIS.

2013-09-23 13:49:24 +10:00

Manifest

completes U4-2706 Change form watching in the validators over to use functions , test using other manifest property editors as parameter editors, fixes up validation in the dialog.

2013-09-20 17:00:34 +10:00

Migrations

Completes: U4-2874 Add a unique index to column cmsMacroProperty.macro + cmsMacroProperty.macroPropertyAlias, U4-2875 Add unique index to column cmsMacro.macroAlias with tests

2013-09-18 19:20:36 +10:00

Models

Fixes merge issues... but now have to fix all the unit tests

2013-09-18 13:26:09 +10:00

Mvc

Ensures the whole ancestry of view data is merged in with unit tests.

2013-08-30 12:50:39 +10:00

Persistence

Fixes macro parameter id assignment at the repo level.

2013-09-20 13:40:32 +10:00

Properties

Added dynamic wrapper support to IFileSystem to allow context specific implementations from which to hang extension methods upon (ie IMediaFileSystem)

2012-08-20 09:42:32 -01:00

PropertyEditors

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

PublishedCache

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

PublishedContent

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

Publishing

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

Resolvers

delete fontawesome

2013-09-02 15:40:14 +02:00

Routing

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

Services

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

Stubs

Web.Routing - RoutesCache goes with PublishedCache

2013-03-20 16:01:49 -01:00

Surface

Fixed up some unit tests

2013-04-04 05:05:52 +06:00

Sync

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

Templates

Fixes: U4-1015, U4-1014

2012-10-11 03:42:18 +05:00

TestHelpers

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

TreesAndSections

Fixes a unit test

2013-09-12 15:31:01 +10:00

UI

Fixes merge issues

2013-07-12 11:51:10 +10:00

UmbracoExamine

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

App.config

Updated SettingsForTest to return mockable umbraco settings so we can set whatever we want. Fixing up unit tests. Removes calls to CleanUmbracoSettingsConfig and EnsureUmbracoSettingsConfig since we should be dealing with the mockable settings.

2013-09-16 19:33:21 +10:00

AsynchronousRollingFileAppenderTests.cs

Added unit test for ContentStore, added object extensions and supporting classes from v5,

2012-07-31 00:02:27 +06:00

AttemptTests.cs

merge branch '6.2.0' into '7.0.0'

2013-09-12 13:09:04 +02:00

EnumerableExtensionsTests.cs

Merge with 6.0.6

2013-05-07 18:57:39 -10:00

GlobalSettingsTests.cs

Got pretty far with deletions. It still doesn't actually do the deletions but the dialog is in place, now just need to inject some more metadata into the menu item to get the legacy delete controller to call the correct rest method to delete the legacy items (again, this is based on the silly ui.xml stuff)

2013-07-11 19:46:13 +10:00

HashCodeCombinerTests.cs

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

HtmlHelperExtensionMethodsTests.cs

Changed IPublishedContentStore and IPublishedMediaStore back to internal as we don't need to expose these yet. Instead have added

2012-09-27 08:30:35 +07:00

LibraryTests.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

MacroEngineFactoryTests.cs

Adds new database table + migration + unit test + fixes up unit tests to ensure PluginManager.Current = null; is done on teardown.

2013-02-13 03:29:32 +06:00

MediaFactoryTests.cs

Adds new database table + migration + unit test + fixes up unit tests to ensure PluginManager.Current = null; is done on teardown.

2013-02-13 03:29:32 +06:00

ObjectExtensionsTests.cs

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

packages.config

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

2013-09-18 12:59:46 +10:00

PluginManagerExtensions.cs

Changed PluginResolverType to PluginManager. Reinstated Resolution and ResolverBase<T> since

2012-08-01 22:06:15 +06:00

PluginManagerTests.cs

Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-11 13:07:22 +10:00

TeamCity.proj

Use the NUnit workaround, like for v4 and ignore test that have been failing for

2013-01-16 17:11:13 -01:00

TypeFinderTests.cs

Merge branch '6.0.7' into 6.1.2

2013-06-21 17:33:42 +02:00

TypeHelperTests.cs

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

Umbraco.Tests.csproj

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

unit-test-log4net.config

Adds unit test for U4-2556 to ensure that it is solved.

2013-07-29 16:42:53 +10:00

UriExtensionsTests.cs

updates uri extensions + tests

2013-07-31 17:08:10 +10:00

UriUtilityTests.cs

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

XmlHelperTests.cs

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