Shannon f6f54fd057 Merge branch 'master-v7' into dev-v8 ...

Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Core/Services/FileService.cs
	src/Umbraco.Core/Services/LocalizationService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
	src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
	src/Umbraco.Web/Services/ApplicationTreeService.cs
	src/Umbraco.Web/Services/SectionService.cs
	src/Umbraco.Web/Trees/MemberTreeController.cs
	src/Umbraco.Web/UI/Pages/ClientTools.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
	src/umbraco.businesslogic/BasePages/ClientTools.cs
	src/umbraco.businesslogic/UmbracoSettings.cs
	src/umbraco.cms/businesslogic/CMSNode.cs
	src/umbraco.cms/businesslogic/Content.cs
	src/umbraco.cms/businesslogic/cache/Cache.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
	src/umbraco.cms/businesslogic/propertytype/propertytype.cs
	src/umbraco.cms/businesslogic/web/Document.cs
	src/umbraco.cms/helpers/DeepLink.cs
	src/umbraco.editorControls/tinyMCE3/TinyMCE.cs

2016-03-10 19:20:15 +01:00

..

AuditLog.cs

Removes the old Log/ILog along with the concept of an ExternalLogger, updates the IAuditService to handle what the Log used to do

2015-12-23 15:22:45 +01:00

ContentBaseItemSave.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

ContentItemBasic.cs

Fixes typo: Updator -> Updater

2014-09-12 11:53:09 +10:00

ContentItemDisplay.cs

Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media.

2013-12-12 14:10:03 +11:00

ContentItemDisplayBase.cs

WIP for model mappers to new content editor save model, udpates to js to use that

2015-10-06 17:19:08 +02:00

ContentItemDto.cs

Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary.

2013-08-28 17:53:31 +10:00

ContentItemFile.cs

Fixes: U4-3696 Upload datatype only updates on first save

2013-11-26 13:13:43 +11:00

ContentItemSave.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

ContentPropertyBasic.cs

Changes imagecropper to store config in its property data

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

ContentPropertyDisplay.cs

Updates PR with fixes for code and implementation logic for the url list.

2015-10-28 12:28:29 +01:00

ContentPropertyDto.cs

Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary.

2013-08-28 17:53:31 +10:00

ContentSaveAction.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

ContentSortOrder.cs

Created a sortable directive to share the markup between content and media and got media sorting done too.

2013-08-13 17:48:56 +10:00

ContentTypeBasic.cs

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

2015-11-17 13:43:19 +01:00

ContentTypeCompositionDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

ContentTypeSave.cs

added logic for media and member type angular callbacks that existed for content types - assuming this is important and should be there for all content types. Added alias information to validation message returned from server.

2016-02-04 19:40:29 +01:00

DashboardControl.cs

merge

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

DataTypeBasic.cs

revalue flag on basic datatype

2015-08-11 11:52:29 +02:00

DataTypeDisplay.cs

Implements the ability to have customized and configurable list views for specific content types

2014-09-22 18:18:09 +10:00

DataTypeSave.cs

more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor)

2013-09-06 15:27:38 +10:00

DocumentTypeDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

DocumentTypeSave.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

EntityBasic.cs

WIP for model mappers to new content editor save model, udpates to js to use that

2015-10-06 17:19:08 +02:00

EntityTypeSearchResult.cs

merge

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

GetAvailableCompositionsFilter.cs

moves model to correct namespace

2016-02-10 13:31:36 +01:00

IErrorModel.cs

Added events.Service and xmlhelper.service

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

IHaveUploadedFiles.cs

Added events.Service and xmlhelper.service

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

INotificationModel.cs

The user change password dashboard now works and adheres to the membership provider rules.

2013-10-17 14:46:16 +11:00

ListViewAwareContentItemDisplayBase.cs

Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media.

2013-12-12 14:10:03 +11:00

MacroParameter.cs

merge

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

MediaItemDisplay.cs

Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media.

2013-12-12 14:10:03 +11:00

MediaItemSave.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

MediaTypeDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MediaTypeSave.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MemberBasic.cs

Allows for email and username to be fields in list view, fixes up the list view usage to display members from a custom membership provider.

2014-09-19 15:34:26 +10:00

MemberDisplay.cs

Fixes up all list views for all content types with regards to the delete button, now if you delete an child of a list view while viewing it it will redirect to it's container.

2014-09-19 13:55:30 +10:00

MemberListDisplay.cs

Fixes up all list views for all content types with regards to the delete button, now if you delete an child of a list view while viewing it it will redirect to it's container.

2014-09-19 13:55:30 +10:00

MemberPropertyTypeBasic.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MemberPropertyTypeDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MemberSave.cs

merge

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

MemberTypeDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MemberTypeSave.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

MessagesExtensions.cs

Added events.Service and xmlhelper.service

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

ModelWithNotifications.cs

merge

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

MoveOrCopy.cs

Added recursive option to copy dialog

2015-10-09 20:25:51 +02:00

Notification.cs

Ensures events for deleting, trashing and unpublishing are done using the event messages, updates UI to support showing these messages in the list view, Since we cannot change the

2015-07-29 15:12:12 +02:00

PreValueFieldDisplay.cs

Updates data type service for the way it saves pre-values so we can maintain ids if necessary - updates the pre-value editors to except a different dictionary which includes an id if necessary. This all fixes: U4-2751 Check that when publishing keys for drop down list prop eds that if we change a value that the id remains constistent

2013-10-24 16:38:00 +11:00

PreValueFieldSave.cs

delete fontawesome

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

PropertyEditorBasic.cs

Adds icon and group to property editor classes

2015-06-24 12:54:06 +02:00

PropertyGroupBasic.cs

ensures that abstract models have a DataContract

2016-01-21 15:06:57 +01:00

PropertyGroupDisplay.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

PropertyTypeBasic.cs

Remove PropertyGroup.ParentId, sanitize Property groups/types

2015-11-17 16:55:14 +01:00

PropertyTypeDisplay.cs

putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab.

2016-02-10 14:34:33 +01:00

PropertyTypeValidation.cs

allows for client side validation on the text box and date picker controls and updates the models to allow support for this for any prop editor.

2014-03-18 15:29:14 +11:00

Relation.cs

Updes more code for U4-337

2015-01-06 15:36:14 +11:00

RelationType.cs

Updes more code for U4-337

2015-01-06 15:36:14 +11:00

RichTextEditorCommand.cs

merge

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

RichTextEditorConfiguration.cs

merge

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

RichTextEditorPlugin.cs

merge

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

SearchResultItem.cs

merge

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

Section.cs

Added events.Service and xmlhelper.service

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

SimpleNotificationModel.cs

Fixes up the error handling with move/copy dialogs.

2015-11-09 17:58:43 +01:00

StyleSheet.cs

Ensures all stylesheet usages in RTE are working as expected

2015-01-15 12:40:09 +11:00

StylesheetRule.cs

Ensures all stylesheet usages in RTE are working as expected

2015-01-15 12:40:09 +11:00

Tab.cs

Makes the 'active' property on a tab a server side thing, updates more resources to use the resourcePromise.

2013-07-10 17:28:15 +10:00

TabbedContentItem.cs

Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication.

2013-07-23 18:55:31 +10:00

UmbracoEntityTypes.cs

merge

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

UserBasic.cs

fixes: U4-3718 Sorting a list view by "Updated by" throws an exception

2013-12-09 14:32:16 +01:00

UserDetail.cs

Includes nice social buttons, updates styling on login and user panel, updates logic to un-link accounts

2015-04-01 13:41:40 +11:00