Shannon 3c3f2d7c8d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 ...

Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/DateTimeExtensions.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/umbraco.MacroEngines/App.Config
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

2014-02-21 16:32:53 +11:00

..

AngularIntegration

completed csrf protection

2013-12-03 11:36:17 +11:00

BootManagers

fixes some merge issues with view engine wrapping PR.

2013-12-19 12:45:46 +11:00

BusinessLogic

ignores these tests for now, they are successful when running isolated but as a whole they don't pass because of something with the legacy data layer.

2014-01-08 18:39:37 +11:00

Cache

Backporting the cachehelper and associated cache classes.

2013-12-16 13:19:10 +11:00

CodeFirst

backports data type service updates and fixes unit tests with correct seeding value.

2013-12-16 17:17:23 +11:00

Configurations

Add support for looking up 3rd party editor file paths

2014-02-19 00:19:13 +01:00

Controllers/WebApiEditors

merge

2013-11-07 17:16:22 +01:00

CoreStrings

U4-4056 - fixing

2014-01-17 10:27:09 +01:00

CoreXml

merge

2013-11-07 17:16:22 +01:00

Dynamics

merge

2013-11-07 17:16:22 +01:00

DynamicsAndReflection

merge

2013-11-07 17:16:22 +01:00

Integration

Make Selenium Contour install work

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

IO

Fixes: U4-3736 Unit test Can_Get_File_Dates() now testing correctly, disregarding local (nont-UTC) time.

2013-11-28 00:09:09 +01:00

Macros

Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor

2014-01-20 13:59:25 +11:00

Manifest

Fixes: U4-2762 Handle errors in package.manifest & fixes manifest stylesheet parsing with unit test

2013-10-09 18:13:24 +11:00

Membership

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

2014-02-21 16:32:53 +11:00

Migrations

Fixes merge issues

2014-02-13 16:46:52 +11:00

Models

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

2014-02-13 16:22:51 +11:00

Mvc

Backporting the cachehelper and associated cache classes.

2013-12-16 13:19:10 +11:00

Persistence

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

2014-02-21 16:32:53 +11: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

Changed method signatures of some of the conversion methods on the PropertyValueEditor to make it more flexible for developers to do what they want.

2013-11-19 11:51:01 +11:00

PublishedCache

Improves test suite performance - this should shed a few minutes off of the test runs.

2013-12-28 14:35:43 +11:00

PublishedContent

Improves test suite performance - this should shed a few minutes off of the test runs.

2013-12-28 14:35:43 +11:00

Publishing

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

2013-09-25 19:09:16 +10:00

Resolvers

Core.Resolution - fix concurrency issues

2013-10-02 11:41:48 +02:00

Routing

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

2014-02-21 16:32:53 +11:00

Services

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

2014-02-21 16:32:53 +11: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 remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Trees

merge

2013-11-07 17:16:22 +01:00

TreesAndSections

Fixes a unit test

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

UI

Completes: U4-2926 Remove unused/obsoleted 'tasks' for media & content

2013-10-01 16:42:32 +10:00

UmbracoExamine

updated to latest examine

2014-02-21 09:54:53 +11:00

App.config

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

2014-02-21 16:32:53 +11: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

Fixes: U4-3581 Make sure advanced v7 prop editors can also be used from xslt

2013-11-20 15:54:50 +11: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

MockTests.cs

Fixes merge issues

2014-02-13 16:46:52 +11:00

ObjectExtensionsTests.cs

Fixes object extensions for dates with a 'kind' specified.

2014-01-29 11:21:35 +11:00

packages.config

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

2014-02-21 16:32:53 +11:00

PluginManagerExtensions.cs

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

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

PluginManagerTests.cs

Fixes some unit tests

2014-02-12 17:25:45 +11: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

Starts fixing up some tests, un-ignores tests that shouldn't be ignored.

2013-11-01 17:32:03 +11:00

TypeHelperTests.cs

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

2013-10-18 16:18:55 +11:00

Umbraco.Tests.csproj

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

2014-02-21 16:32:53 +11:00

unit-test-log4net.config

fixes up unit tests

2013-12-16 13:55:46 +11:00

UriExtensionsTests.cs

ensures webapi plugincontrollers are routed to /backoffice if [IsBackOffice] is specified

2014-01-15 13:29:17 +11:00

UriUtilityTests.cs

Improves test suite performance - this should shed a few minutes off of the test runs.

2013-12-28 14:35:43 +11:00

XmlExtensionsTests.cs

Fixes: U4-3485 Can't use membership provider functions with a membertype that contains a "Belle" property editor

2013-11-12 16:07:53 +11:00

XmlHelperTests.cs

Fixes: U4-3485 Can't use membership provider functions with a membertype that contains a "Belle" property editor

2013-11-12 16:07:53 +11:00