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 |
|
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 |
|
Shannon
|
cd2ce2486a
|
Fixes debugger display attribute
|
2019-06-21 15:46:16 +10: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 |
|
Kenn Jacobsen
|
c0f26f93b3
|
WIP for property level copying
|
2019-06-20 22:07:59 +02:00 |
|
Niels Lyngsø
|
23702ee4dc
|
Fixes notifications issue for new variant saving, allows "soft redirect" for creating (#5646)
Fixes notifications issue for new variant saving, allows "soft redirect" for creating
|
2019-06-19 12:34:33 +02:00 |
|
Shannon
|
5c2b0647f3
|
Gets the feature in v7 based on #2682 that wasn't merged upwards to v8 and found some issues along the way like not filtering the mini list view properly along with not returning the content type alias in the entity controller
|
2019-06-19 16:42:04 +10:00 |
|
Stephan
|
94d2a5cbad
|
Bugfix published cache and children
|
2019-06-17 13:03:01 +02: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 |
|
Shannon
|
2797011fb0
|
Ensures there's no duplicate notifications and ensures that soft redirects occur for content blueprints too
|
2019-06-12 11:34:36 +10:00 |
|
Shannon
|
1f64ae4682
|
Fixes language/variant mapping so it's consistent and by lang name not iso
|
2019-06-11 17:17:19 +10:00 |
|
Shannon
|
120f4c3096
|
removes scope.busy callls (legacy old stuff), add ability to preserve editor state between routes, for content we now preserve editor state when redirecting to new content and then rebind some values from that editor state when the editor loads, updates editorstate.service and filemanager.service to manage themselves on route change (decoupling), fixes variant mapper to ensure that the variants are always returned in a deterministic order.
|
2019-06-11 16:31:32 +10:00 |
|
Stephan
|
7fd6bfa163
|
Make IPublishedContent changes less breaking and more friendly
|
2019-06-06 16:54:00 +02:00 |
|
Stephan
|
1dde60a1d5
|
Merge branch v8/dev into v8/feature/5170-IPublishedContent
|
2019-06-06 12:12:49 +02:00 |
|
Poornima Nayar
|
864d83f8f7
|
Introduce a maxlength on the name of the node (#5374)
|
2019-06-03 11:41:58 +02:00 |
|
Sebastiaan Janssen
|
fef9248b51
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
# src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-05-31 11:36:29 +02:00 |
|
Sebastiaan Janssen
|
6af1057ad7
|
Merge pull request #5508 from Geckex/v7/temp-5507
MemberModelMapper to return member groups ordered alphabetically
|
2019-05-30 17:38:53 +02:00 |
|
Stephan
|
8579b5a89b
|
Merge branch 'v8/dev' into v8/feature/5170-IPublishedContent
|
2019-05-29 08:48:18 +02:00 |
|
Thomas Poulsen
|
50c2d574f1
|
Change MemberModelMapper GetMemberGroupValue to return member groups ordered alphabetically.
- This is used in ContentPropertyDisplay class - for UI purposes only.
|
2019-05-22 14:13:46 +01:00 |
|
Rasmus John Pedersen
|
f00a230d12
|
Merge branch 'v8/dev' into v8/feature/4940-save-media-reference-instead-of-media-url
|
2019-05-01 08:55:55 +02:00 |
|
Stephan
|
bb0331e9cc
|
Move IPublishedContent.Url() to ext method
|
2019-04-24 14:25:41 +02:00 |
|
Stephan
|
25b8c8a565
|
Refactor getting Urls
|
2019-04-24 11:53:35 +02:00 |
|
Stephan
|
be93773399
|
Merge branch v8/dev into v8/feature/5170-IPublishedContent
|
2019-04-24 08:51:25 +02:00 |
|
Stephan
|
e6f6c498a5
|
Merge branch v8/dev into v8/feature/4942-media-url-provider
|
2019-04-23 13:58:17 +02:00 |
|
Stephan
|
6f0baa4a8e
|
Merge branch v8/dev into v8/feature/5170-IPublishedContent
|
2019-04-23 10:47:40 +02:00 |
|
Stephan
|
a56f3b23d1
|
Cleanup PublishedMember
|
2019-04-23 08:29:43 +02:00 |
|
Stephan
|
4feb766cc6
|
Fix IPublishedContent.Children() and NuCache
|
2019-04-23 08:29:43 +02:00 |
|
Stephan
|
2270188668
|
Refactor IPublishedContent.Children()
|
2019-04-23 08:28:23 +02:00 |
|
Stephan
|
41e14a62c0
|
Refactor IPublishedContent.Parent()
|
2019-04-23 08:27:50 +02:00 |
|
Stephan
|
e062ea8d31
|
Refactor IPublishedContent.CultureDate(), .Cultures
|
2019-04-23 08:27:50 +02:00 |
|
Stephan
|
afda7a5661
|
Refactor IPublishedContent.ItemType
|
2019-04-23 08:27:49 +02:00 |
|
Stephan
|
11ef00c63d
|
Refactor IPublishedContent.Url()
|
2019-04-23 08:27:49 +02:00 |
|