yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,970 Commits 4 Branches 7 Tags
055f18d6398761ecdb69a8faee8c91d61e58c05a
Commit Graph

1814 Commits

Author SHA1 Message Date
Sebastiaan Janssen
055f18d639 Add back ctor to revert a breaking change 2020-04-15 09:52:07 +02:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-01-22 08:36:32 +00:00
Poornima Nayar
1cd30aae99 Merge pull request #6943 from kjac/v8/fix/protect-system-media-types 
V8: Protect "system media types" from alias changes and deletion
 2020-01-09 14:18:10 +00:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Shannon
1d61bc829c Merge branch 'v8/dev' into v8/fix/6324-wrong-media-path-stored 2019-12-18 12:10:00 +11:00
Warren Buckley
9fea3ea500 Merge branch 'feature/5702-custom-validation-messages' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-feature/5702-custom-validation-messages 
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
 2019-11-21 10:10:15 +01:00
Shannon Deminick
b68f1d44f1 Merge pull request #6599 from ronaldbarendse/v8/bugfix/5947-custom-exceptions 
Fixed and cleaned up custom exception classes
 2019-11-21 19:21:19 +11:00
Shannon
895f68d9e2 Fixes bulk insert records, adjusts parsing of object types 2019-11-20 12:15:27 +11:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Warren Buckley
dc494ff525 MemberEntitySlim has the same properties as ContentEntitySlim so lets inherit it 2019-11-18 12:18:50 +00:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Shannon
12541e7e8f reverts changes to IUmbracoEntity, we don't need to query on the object type property 2019-11-06 13:22:12 +11:00
Matt Brailsford
0b16c48fc3 Split PagedResult into a typed and non-typed version (Fixes #46… (#6871) 2019-11-05 11:59:04 +01:00
Shannon
602acce8f4 Gets entity repository to be able to return a mix of object types 2019-11-05 15:50:49 +11:00
Shannon
595b36c5df Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
 2019-11-01 13:27:13 +11:00
Rasmus John Pedersen
26f1e77813 Resolve media paths from data editors 
# Conflicts:
#	src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2019-10-30 21:58:54 +01:00
Kenn Jacobsen
546a948d0b Protect "system media types" from alias changes and deletion 2019-10-29 12:13:42 +01:00
Bjarke Berg
da698a9a85 AB2462 - Code review fixes 2019-10-29 09:57:32 +01:00
Bjarke Berg
5699dc32b7 AB2462 - Find the relation type from the entity type on the udi 2019-10-28 12:53:37 +01:00
Shannon
ae64fe49be Allows relation types to not have specific object types, updates IRelation to return the actual object types for the ID references, now relations can be more flexible without being strangely tied to specific object types based on the relation type. 2019-10-24 21:32:00 +11:00
Shannon
193892f084 Creates method to create the relations based on the property editor's returned reference but have discovered a gotcha for relations, so next step is to resolve that. 2019-10-24 16:48:21 +11:00
Dave Woestenborghs
88f153e7a3 V8 - Make it possible to set content app badge through content… (#6706) 2019-10-23 17:31:18 +02:00
Ronald Barendse
d0303f74fd Allow hash type on GenerateHash and remove obsoleted ToMd5 and ToSHA1 methods (#6679) 2019-10-23 17:19:49 +02:00
Kenn Jacobsen
f6d00a177e V8: Support allowed types for MNTP member picker (#6524) 2019-10-14 14:34:33 +02:00
Ronald Barendse
ed90e71f76 Removed usage of obsoleted ArgumentNullOrEmptyException 2019-10-07 22:10:21 +02:00
Ronald Barendse
6350c8c05b Removed usage of obsoleted WontImplementException 2019-10-06 11:55:02 +02:00
Andy Butland
0fe373259b Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-09-30 18:45:00 +02:00
Rasmus John Pedersen
ae6004166f Disallow deleting "Sensitive data" user group 2019-09-26 18:40:45 +02:00
Stephan
280f4e7cbe Fix member properties [#6227] 2019-09-05 16:34:17 +02:00
Shannon
db6714d3b8 Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
 2019-08-14 10:39:15 +10:00
Bjarke Berg
2cdb6d86ad Merge pull request #6019 from umbraco/v8/bugfix/pending-changes-issue 
v8 Changing a property type from invariant to variant and back again causes issues with reporting that a document is edited or not
 2019-08-06 09:09:12 +02:00
Shannon
9538981730 Adds more assertions and tests and validates variations 2019-08-01 18:49:05 +10:00
Shannon
34f137c8cf Merge branch 'v8/bugfix/panic-exception' into v8/bugfix/5554-unpublish-state 2019-07-30 22:50:06 +10:00
Shannon
16d8f8846e Adds PanicException with details instead of throwing "panic" strings 2019-07-30 22:40:15 +10:00
Shannon
5a9ca8d09f wip added more tests and notes 2019-07-30 22:20:27 +10:00
hifi-phil
62f924a757 Change PropertyType.Alias to virtual 
When unit testing PropertyType.Alias needs to be virtual to make it mockable. The underlying code on the set triggers IOC logic and makes it hard to test anything that uses Property Types.
 2019-07-14 09:45:12 +01:00
Bjarke Berg
988d51c4c8 Merge pull request #5767 from umbraco/v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode 
V8: Bugfix for Modelsbuilder models with different versions error
 2019-07-03 13:43:00 +02:00
Shannon
cd6ef35bf9 comments out the fix during investigation - adds some notes 2019-07-03 15:17:51 +10:00
Shannon
f7382255c2 Fixes N+1 Issues caused by the new bypass start nodes changes 2019-07-03 13:16:40 +10:00
Shannon
ba7cd48b8f Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715 
# Conflicts:
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2019-07-02 10:49:20 +10:00
Kenn Jacobsen
e5956e4955 V8: Don't cast IContent to Content in DocumentRepository (#4611) 2019-06-28 09:19:11 +02:00
Shannon
4a33ca99ba More manual merging 2019-06-28 15:03:52 +10:00
Shannon
568835f7e2 manual merging/fixing, project builds now, but need to manually merge the remaining 2019-06-28 13:24:13 +10:00
Shannon
84aa861a5b Merge remote-tracking branch 'origin/v7/dev' into v8/dev - Iniital commit (broken) 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Models/DataTypeDefinition.cs
#	src/Umbraco.Core/Models/DataTypeExtensions.cs
#	src/Umbraco.Core/Models/IDataTypeDefinition.cs
#	src/Umbraco.Core/Models/UmbracoEntity.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
#	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/DataTypeService.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Services/IDataTypeService.cs
#	src/Umbraco.Core/Services/IEntityService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/Implement/RelationService.cs
#	src/Umbraco.Tests/Models/UmbracoEntityTests.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/search.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
#	src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
#	src/Umbraco.Web/WebBootManager.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
#	src/umbraco.cms/businesslogic/web/Access.cs
 2019-06-28 13:03:36 +10:00
Andy Butland
25ae6514c7 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-06-27 19:56:28 +02:00
Andy Butland
a90f0c4070 Added custom validation messages to property types: model, dto and migration, update via property type editing, display when content editing. 2019-06-26 14:37:02 +02:00
Shannon
c2cb85f1cd Merge branch 'v8/dev' into v8/feature/5170-IPublishedContent 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-06-21 15:06:43 +10:00
Shannon
81077c2681 Gets the entity service returning a media's url property and allows this to be used in the media picker. 2019-06-13 23:39:36 +10:00
Stephan
14a056f4f4 Fix and cleanup 2019-06-07 11:15:58 +02:00
Stephan
7fd6bfa163 Make IPublishedContent changes less breaking and more friendly 2019-06-06 16:54:00 +02:00