swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,663 Commits 73 Branches 219 Tags
3dbebfb153a20e7e18aeaaafbb6325bfca0cf526
Commit Graph

1630 Commits

Author SHA1 Message Date
Shannon 3dbebfb153 Refactors the usage of ICultureDictionary so its injectable, removes more uses of Current, removes unused methods relying on System.Web 2019-11-22 13:13:19 +11:00
Bjarke Berg 4d5d94d3ed 7173 - Refactored to inject IUmbracoVersion instead of using Current. 2019-11-20 10:50:15 +01:00
Carole Rennie Logan 100d4431dc removing unused using statements 2019-11-19 23:24:08 +00:00
Shannon fe2a919573 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move_icontent_type 2019-11-19 11:52:09 +11:00
Bjarke Berg 50e61e9227 More usage of IPropertyType, and moved more classes 2019-11-18 13:03:24 +01:00
Shannon cd3a97ce75 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Abstractions/Constants-Conventions.cs
 2019-11-18 19:58:42 +11:00
Bjarke Berg 47a0326e9c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-15 11:43:05 +01:00
Bjarke Berg 126380dcee AB3594 - Removed references from core to configuration 2019-11-14 12:49:56 +01:00
Bjarke Berg 73167029f0 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-14 08:05:32 +01:00
Shannon 3bd223669f Moves as much as possible from Models/Packaging, Models/PublishedContent, Models/Entities, Models/Membership 2019-11-14 16:19:24 +11: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
Bjarke Berg 6da93c6fc3 AB3649 - Refactored services injected into ctor instead of methods 2019-11-12 10:42:39 +01:00
Bjarke Berg b4880944be Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3649-move-manifest-stuff 
# Conflicts:
#	src/Umbraco.Core/CompositionExtensions_Essentials.cs
 2019-11-12 10:38:33 +01:00
Shannon 545a427d11 abstracts out IScript, stops casting stuff 2019-11-12 13:49:56 +11:00
Bjarke Berg e5c3b1f8aa AB3649 - More refactor of Property to IProperty... 2019-11-08 15:10:05 +01:00
Bjarke Berg 13507c0e13 AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭) 2019-11-08 07:51:14 +01:00
Bjarke Berg 63bfc4c2c0 Move constants 2019-11-05 14:55:42 +01:00
Bjarke Berg befcabfced Move constants 2019-11-05 13:28:26 +01:00
Jeavon 04004876b1 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-10-29 12:13:09 +00: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
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
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
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
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