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

Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web.UI/config/feedProxy.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/config/xsltExtensions.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

2014-02-25 02:24:45 +11:00

..

Css

…

Editors

…

EntityBase

Properly exposes the IRememberBeingDirty.ResetDirtyProperties required method

2013-10-10 19:03:59 +11:00

Mapping

fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration

2014-01-09 13:32:39 +11:00

Membership

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

2014-02-17 15:56:48 +11:00

PublishedContent

Allows DefaultPropertyValueConverters to shadow other default converters, this allows us to have a hierarchy of default converters. This also fixes part of this issue: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong

2014-01-15 14:45:33 +11:00

Rdbms

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

2013-12-18 18:11:56 +11:00

Validation

…

ApplicationTree.cs

Creates public IApplicationTreeService and ISectionService interfaces, adds initialization methods

2013-10-09 14:31:30 +11:00

Content.cs

…

ContentBase.cs

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

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

ContentExtensions.cs

Not raising export events for content/media ToXml extension for the time being

2014-01-20 10:37:46 +01:00

ContentStatus.cs

…

ContentType.cs

…

ContentTypeBase.cs

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

2013-12-17 11:42:50 +11:00

ContentTypeCompositionBase.cs

…

ContentTypeExtensions.cs

…

ContentTypeSort.cs

…

DataTypeDatabaseType.cs

…

DataTypeDefinition.cs

Completes: U4-3020 Installning package with legacy data types just gives error

2013-10-25 16:28:46 +11:00

DictionaryItem.cs

Adding languages xml to existing xml file for testing purposes

2014-01-10 15:38:57 +01:00

DictionaryTranslation.cs

…

EntityExtensions.cs

Starts wrapping MemberTypeService from the legacy MemberType object. Changes the User.Id to an int - no more casting. Changes CreateMember to CreateMemberWithIdentity for consistency. Adds raiseEvent params to the create/save methods. Updates the MemberTypeService to have consistent naming conventions. Starts wrapping more of the MemberService from the legacy Member object.

2014-01-23 10:41:57 +11:00

File.cs

Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task

2014-01-09 18:08:13 +11:00

IContent.cs

…

IContentBase.cs

…

IContentType.cs

…

IContentTypeBase.cs

…

IContentTypeComposition.cs

…

IDataTypeDefinition.cs

…

IDictionaryItem.cs

…

IDictionaryTranslation.cs

…

IFile.cs

…

ILanguage.cs

…

IMacro.cs

merge

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

IMacroProperty.cs

merge

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

IMacroPropertyType.cs

merge

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

IMedia.cs

…

IMediaType.cs

…

IMember.cs

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

2014-01-08 14:32:38 +11:00

IMemberGroup.cs

Got new MemberGroupService done, completed the MemberService for role based stuff, created a member group cache refresher since we are caching member groups by name (probably should cache others too). Public access stuff changes if a name of a member group is changed which is now done with an event instead of coded into the biz logic.

2014-02-12 17:14:16 +11:00

IMemberType.cs

merge

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

IPublishedContent.cs

Take care of FIXMEs

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

IPublishedProperty.cs

merge

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

IRelation.cs

Back ported relationship repo/service updates

2013-12-16 18:44:11 +11:00

IRelationType.cs

Back ported relationship repo/service updates

2013-12-16 18:44:11 +11:00

ITag.cs

merge

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

ITemplate.cs

Updated request after feedback

2014-02-13 15:21:40 +11:00

Language.cs

Adding languages xml to existing xml file for testing purposes

2014-01-10 15:38:57 +01:00

Macro.cs

Changing the name of the private field to be more inline with the Property

2014-01-17 15:28:53 +01:00

MacroProperty.cs

Removing extra line spaces

2014-01-17 15:28:12 +01:00

MacroPropertyCollection.cs

merge

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

MacroPropertyTypeBaseTypes.cs

merge

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

MacroTypes.cs

merge

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

Media.cs

…

MediaType.cs

…

Member.cs

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

2014-02-25 02:24:45 +11:00

MemberGroup.cs

Got new MemberGroupService done, completed the MemberService for role based stuff, created a member group cache refresher since we are caching member groups by name (probably should cache others too). Public access stuff changes if a name of a member group is changed which is now done with an event instead of coded into the biz logic.

2014-02-12 17:14:16 +11:00

MemberType.cs

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

2014-02-19 16:55:56 +11:00

MemberTypePropertyProfileAccess.cs

Fixes: U4-4257 Fix member type editor to not have to re-call 'Save' so many times,

2014-02-19 16:14:34 +11:00

Notification.cs

Created notifications repository and service with unit tests, then need to start integrating that so notifications are properly sent.

2014-01-10 17:03:00 +11:00

PagedResult.cs

merge

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

PreValue.cs

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

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

PreValueCollection.cs

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

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

Property.cs

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

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

PropertyCollection.cs

…

PropertyExtensions.cs

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

PropertyGroup.cs

…

PropertyGroupCollection.cs

…

PropertyTags.cs

merge

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

PropertyType.cs

Fixes merge issues

2014-02-21 16:43:49 +11:00

PropertyTypeCollection.cs

…

PublishedItemType.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

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

PublishedState.cs

…

Relation.cs

Back ported relationship repo/service updates

2013-12-16 18:44:11 +11:00

RelationType.cs

Back ported relationship repo/service updates

2013-12-16 18:44:11 +11:00

Script.cs

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

2013-09-25 19:23:41 +10:00

Section.cs

…

ServerRegistration.cs

…

Stylesheet.cs

…

StylesheetProperty.cs

…

Tag.cs

merge

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

TaggableObjectTypes.cs

merge

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

Task.cs

…

TaskType.cs

…

Template.cs

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

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

TemplateNode.cs

back ported template repo and file service updates

2013-12-16 18:10:44 +11:00

UmbracoEntity.cs

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

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

UmbracoEntityExtensions.cs

Fixes: U4-4055 List View document types still display children in content tree

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

UmbracoObjectTypes.cs

Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that.

2013-11-15 14:53:26 +11:00

UmbracoObjectTypesExtensions.cs

Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe

2013-09-30 12:02:35 +10:00

UserExtensions.cs

Nearly have send to publish working, it's all wired up in the UI to the controller, just need to implement the logic.

2013-10-31 18:17:30 +11:00