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

1629 Commits

Author SHA1 Message Date
Dave Woestenborghs
eeaa5a82d4 V8/doctype tours (#6980) 2020-01-10 10:39:22 +01: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
Bjarne Fyrstenborg
0dfd7679e0 Request datatype by guid (#6847) 2020-01-08 19:02:16 +01:00
Rob Maas
809ab6d05f Added ContentApps for Members (#6670) 2019-12-18 10:43:41 +01:00
Daniël Knippers
06074ead44 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into pr/6691_vary-by-culture-set-unset-culture-flag-only 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
 2019-11-22 09:08:27 +01: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
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Jeavon
88f6ddeae4 Code tweaks from PR review - also led to adding logging for Deserialization issues and therefore needing to mock the logger for the tests 2019-11-13 12:07:11 +00:00
Daniël Knippers
965d6cbeb7 Added enum extension methods + tests for SetFlag and UnsetFlag. 2019-10-30 11:04:53 +01:00
Jeavon
04004876b1 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-10-29 12:13:09 +00:00
Kenn Jacobsen
546a948d0b Protect "system media types" from alias changes and deletion 2019-10-29 12:13:42 +01:00
Kenn Jacobsen
b1037786ca V8: Use member type icon in member pickers (#6696) 2019-10-24 20:46:01 +02:00
Bjarke Berg
c072015288 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB2913-DataTypeTracking 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2019-10-21 09:40:21 +02:00
Bjarke Berg
ba215f8700 fix name to follow the class name 2019-10-21 09:34:35 +02:00
Daniël Knippers
1a92dbfd8f Properly set / unset Culture flag instead of removing _all_ flags when "Vary by Culture" is false. 2019-10-15 10:54:51 +02:00
Claus
ec6b38175c Merge pull request #6458 from umbraco/fix/6377-disable-deleting-sensitive-data-user-group 
Disallow deleting "Sensitive data" user group
 2019-10-10 10:59:37 +02:00
Bjarne Fyrstenborg
0567ed9a34 Fix incorrect path in member group mapping 2019-10-09 10:15:45 +02:00
Shannon
ac300179e6 Adds new endpoint to DataTypeController to return the correct data and wires that up to angular 2019-10-09 15:19:03 +11:00
Ronald Barendse
ed90e71f76 Removed usage of obsoleted ArgumentNullOrEmptyException 2019-10-07 22:10:21 +02:00
Jeavon
68866e9faf Adding a constant for the new field name 2019-10-04 11:17:36 +01:00
Jeavon
e4df2f4205 Add ability for editors to search for media items by file name as well as node name. 2019-10-03 17:46:18 +01:00
Shannon
b4c6930c11 Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2019-10-02 10:47:09 +02:00
Shannon
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +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
Rasmus John Pedersen
6beb84442c Disable rename alias of system user groups 2019-09-26 18:34:48 +02:00
Kenn Jacobsen
2cbed6c6b0 Merged with v8/dev 2019-09-09 11:22:39 +02:00
Kenn Jacobsen
604bb6b526 Don't allow selecting non-element types when composing element types 2019-09-05 17:57:40 +02:00
Andy Butland
8fdc14f360 Added metadata indicating if document published for content picker display 2019-08-29 14:27:31 +02:00
Benjamin Carleski
289d50d170 Fix FIPS compliance, add FIPS tests (#5978) 
(cherry picked from commit e495faf83c)
 2019-08-07 19:34:13 +02:00
Shannon
16d8f8846e Adds PanicException with details instead of throwing "panic" strings 2019-07-30 22:40:15 +10:00
Kenn Jacobsen
742a664ec3 Merged with v8/dev 2019-07-12 22:38:43 +02:00
Bjarke Berg
c5f1cc15fd Refactored dataTypeId when a guid into dataTypeKey 2019-07-03 08:33:30 +02:00
Shannon
f7382255c2 Fixes N+1 Issues caused by the new bypass start nodes changes 2019-07-03 13:16:40 +10:00
Bjarke Berg
e6484687e5 Small fixes after v7 to v8 merge regarding the bypass security feature 2019-07-02 11:17:23 +02:00
Shannon
4134dd16df adds fixme note 2019-07-02 12:04:58 +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
Shannon
80e6880bb7 more manual merging - getting anchors back in tinymce 2019-07-01 16:22:54 +10: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
leekelleher
580ba79619 Icon Constants consistency 
Updated the `Constants.Icons` and replaced the hard-coded strings with
 the const references.
 2019-06-27 22:35:29 +02:00
Andy Butland
25ae6514c7 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-06-27 19:56:28 +02:00
Bjarke Berg
acbe82f4c8 Merge pull request #5688 from umbraco/v8/bugfix/expand-tree-fix 
Feature in v7 based on #2682 that wasn't merged upwards to v8
 2019-06-27 07:53:15 +02:00
Shannon
ef714ac258 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5170-IPublishedContent 
# Conflicts:
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-06-27 14:44:33 +10:00
Bjarke Berg
fbf3015de4 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/expand-tree-fix 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
 2019-06-26 14:38:19 +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
Andy Butland
9fffdb407a Provided alternative messages for users that do and do not have access to document/media types for when trying to create content or media and no types can be created. 
Where they do, provided a link to go to the page where child nodes can be edited.
 2019-06-23 13:02:15 +02:00