yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2db1c1bb405ae37621d85f77cf3a3dca243569a9
Umbraco-CMS/src/Umbraco.Tests
History
Shannon 921a5963e2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/create/simple.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
2014-03-10 17:30:46 +11:00
..
AngularIntegration
fixes last unit test
2014-02-21 18:09:46 +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
updated to use constant
2014-02-25 02:36:25 +11: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
…
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-03-10 17:30:46 +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-03-06 20:22:32 +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-03-10 15:27:09 +11:00
Properties
…
PropertyEditors
fixes another test
2014-02-21 18:03:26 +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
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
Publishing
…
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-03-06 20:22:32 +11:00
Surface
…
Sync
…
Templates
…
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
…
UI
…
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
…
AttemptTests.cs
…
EnumerableExtensionsTests.cs
…
GlobalSettingsTests.cs
…
HashCodeCombinerTests.cs
…
HtmlHelperExtensionMethodsTests.cs
…
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
…
MediaFactoryTests.cs
…
MockTests.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0-installer
2014-03-03 04:17:40 +01: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
…
PluginManagerTests.cs
fixes another test
2014-02-21 18:04:15 +11:00
TeamCity.proj
…
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
Removed all the legacy files that we don't need - need to test the starter kit installation process in the back office though as some old files are still used there.
2014-03-05 19:47:00 +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