yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cd2cf26274fc4f8f4db539903da38cd9f8f84387
Umbraco-CMS/src/Umbraco.Core/Models
History
Shannon c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
2018-10-22 16:03:01 +11:00
..
ContentEditing
ContentApp Show/Hide per user Role
2018-10-14 15:56:22 +01:00
Editors
Start to setting files with a culture and catering for being able to set any metadata for files
2018-08-07 00:43:52 +10:00
Entities
wip for IDocumentEntitySlim changes
2018-09-20 14:58:15 +10:00
Identity
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
2018-08-29 01:15:46 +10:00
Membership
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
Packaging
minor merge fixes
2018-07-31 15:11:31 +10:00
PublishedContent
Cleanup
2018-10-16 10:58:17 +02:00
Validation
Renormalize
2018-06-29 19:52:40 +02:00
ApplicationTree.cs
Renormalize
2018-06-29 19:52:40 +02:00
AuditEntry.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
AuditItem.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
AuditType.cs
gets unpublish working
2018-10-03 14:27:48 +02:00
Consent.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
ConsentExtensions.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
ConsentState.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
Content.cs
Fix dates in document versions
2018-10-17 17:27:39 +02:00
ContentBase.cs
Cleanup some DTOs
2018-09-25 18:05:14 +02:00
ContentStatus.cs
Renormalize
2018-06-29 19:52:40 +02:00
ContentTagsExtensions.cs
DataType refactoring - troubleshooting tags and fixing tests
2018-02-01 14:14:45 +01:00
ContentType.cs
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
ContentTypeAvailableCompositionsResult.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
ContentTypeAvailableCompositionsResults.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
ContentTypeBase.cs
Removed the override of IsPropertyDirty as is not needed.
2018-10-10 08:26:10 +02:00
ContentTypeBaseExtensions.cs
Writes tests to ensure that property values are updated in docs that are of a composed type of the one that variants are being changed in.
2018-10-05 15:07:19 +02:00
ContentTypeCompositionBase.cs
Variations with Compositions
2018-07-16 17:21:26 +02:00
ContentTypeSort.cs
Misc cleanup of PR
2018-07-09 18:08:03 +02:00
ContentVariation.cs
Variations with Compositions
2018-07-16 17:21:26 +02:00
DataType.cs
Ensure data types get a proper default configuration when created
2018-09-17 12:54:22 +02:00
DataTypeExtensions.cs
DataType refactoring - troubleshooting and fixing tests
2018-01-29 19:23:25 +01:00
DeepCloneHelper.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
DictionaryItem.cs
Renormalize
2018-06-29 19:52:40 +02:00
DictionaryItemExtensions.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
DictionaryTranslation.cs
Renormalize
2018-06-29 19:52:40 +02:00
DoNotCloneAttribute.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
EntityContainer.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:44:49 +01:00
EntityExtensions.cs
Refactor Variants at service level
2018-07-04 08:59:50 +02:00
File.cs
Renormalize
2018-06-29 19:52:40 +02:00
Folder.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
GridValue.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
IAuditEntry.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
IAuditItem.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
IConsent.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
IContent.cs
Allows the overlay view to be created with a custom parent scope so that broadcast/emit work correctly for the code within the overlay to be a 'child' of the editor that invoked it.
2018-08-30 20:21:25 +10:00
IContentBase.cs
Cleanup some DTOs
2018-09-25 18:05:14 +02:00
IContentType.cs
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
IContentTypeBase.cs
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-22 16:03:01 +11:00
IContentTypeComposition.cs
Writes tests to ensure that property values are updated in docs that are of a composed type of the one that variants are being changed in.
2018-10-05 15:07:19 +02:00
IDataType.cs
Refactor editing, cleanup
2018-02-25 10:43:16 +01:00
IDeepCloneable.cs
DataType refactoring preparation - Entity refactoring
2018-01-10 12:48:51 +01:00
IDictionaryItem.cs
Renormalize
2018-06-29 19:52:40 +02:00
IDictionaryTranslation.cs
Renormalize
2018-06-29 19:52:40 +02:00
IDomain.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
IFile.cs
Renormalize
2018-06-29 19:52:40 +02:00
ILanguage.cs
U4-11502 misc fixes
2018-07-18 12:27:14 +02:00
IMacro.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMacroProperty.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMedia.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMediaType.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMember.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMemberGroup.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 15:54:06 +01:00
IMemberType.cs
Renormalize
2018-06-29 19:52:40 +02:00
IMigrationEntry.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
IPartialView.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
IRedirectUrl.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
IRelation.cs
Renormalize
2018-06-29 19:52:40 +02:00
IRelationType.cs
Renormalize
2018-06-29 19:52:40 +02:00
IServerRegistration.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
ITag.cs
Renormalize
2018-06-29 19:52:40 +02:00
ITemplate.cs
Renormalize
2018-06-29 19:52:40 +02:00
Language.cs
U4-11502 misc fixes
2018-07-18 12:27:14 +02:00
Macro.cs
Renormalize
2018-06-29 19:52:40 +02:00
MacroProperty.cs
Renormalize
2018-06-29 19:52:40 +02:00
MacroPropertyCollection.cs
Renormalize
2018-06-29 19:52:40 +02:00
MacroTypes.cs
Renormalize
2018-06-29 19:52:40 +02:00
Media.cs
Renormalize
2018-06-29 19:52:40 +02:00
MediaExtensions.cs
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
2018-08-17 15:41:58 +01:00
MediaType.cs
Renormalize
2018-06-29 19:52:40 +02:00
Member.cs
Verified the log works correctly from my TODO note
2018-08-23 13:23:40 +01:00
MemberGroup.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 15:54:06 +01:00
MemberType.cs
Renormalize
2018-06-29 19:52:40 +02:00
MemberTypePropertyProfileAccess.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:33 +01:00
MigrationEntry.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
Notification.cs
…
ObjectTypes.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
PagedResult.cs
Renormalize
2018-06-29 19:52:40 +02:00
PartialView.cs
Removed obsolete methods from Umbraco.Core which are not used
2018-07-01 18:58:58 +01:00
PartialViewType.cs
U4-10098 Update FileService to support legacy MacroScript and UserControl folders
2017-07-04 14:28:15 +02:00
PathValidationExtensions.cs
Last pass of updating log messages in the solution
2018-08-16 12:42:21 +01:00
Property.cs
Make TagSupport and related types public #2988
2018-09-29 17:42:45 +02:00
PropertyCollection.cs
Renormalize
2018-06-29 19:52:40 +02:00
PropertyGroup.cs
Renormalize
2018-06-29 19:52:40 +02:00
PropertyGroupCollection.cs
Renormalize
2018-06-29 19:52:40 +02:00
PropertyTagsExtensions.cs
Last pass of updating log messages in the solution
2018-08-16 12:42:21 +01:00
PropertyType.cs
more work on validation, saving and publishing
2018-08-06 16:50:40 +10:00
PropertyTypeCollection.cs
RemoveItem now returns a bool
2018-10-10 08:27:20 +02:00
PublicAccessEntry.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
PublicAccessRule.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
PublishedState.cs
Renormalize
2018-06-29 19:52:40 +02:00
Range.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
RedirectUrl.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
Relation.cs
Renormalize
2018-06-29 19:52:40 +02:00
RelationType.cs
Renormalize
2018-06-29 19:52:40 +02:00
Script.cs
Renormalize
2018-06-29 19:52:40 +02:00
Section.cs
Make Tests Green Again
2018-10-09 23:02:22 +02:00
ServerRegistration.cs
Renormalize
2018-06-29 19:52:40 +02:00
Stylesheet.cs
Renormalize
2018-06-29 19:52:40 +02:00
StylesheetProperty.cs
Renormalize
2018-06-29 19:52:40 +02:00
Tag.cs
Renormalize
2018-06-29 19:52:40 +02:00
TaggableObjectTypes.cs
Renormalize
2018-06-29 19:52:40 +02:00
TaggedEntity.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
TaggedProperty.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
TagsStorageType.cs
DataType refactoring - troubleshooting tags and fixing tests
2018-02-01 14:14:45 +01:00
Template.cs
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
2018-08-29 01:15:46 +10:00
TemplateNode.cs
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
TemplateOnDisk.cs
…
UmbracoDomain.cs
DataType refactoring preparation - Entity refactoring
2018-01-15 13:28:35 +01:00
UmbracoObjectTypes.cs
Renormalize
2018-06-29 19:52:40 +02:00
UserExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
ValueStorageType.cs
DataType refactoring - in progress
2018-01-26 17:55:20 +01:00