Sebastiaan Janssen
|
7db0440b5c
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/UriExtensions.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/search.service.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/mediaPicker/mediapicker.controller.js
# 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/components/content/umb-content-node-info.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/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.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/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
|
2019-04-17 14:35:59 +02:00 |
|
Shannon Deminick
|
0cf609fdce
|
Merge pull request #5240 from umbraco/v8/bugfix/5222-nucache-vanishing-content
NuCache: fix vanishing content when refreshing content types
|
2019-04-15 12:55:43 +10:00 |
|
Stephan
|
aa75fcfdb3
|
Fix bad local temp path
|
2019-04-12 17:40:10 +02:00 |
|
Warren Buckley
|
ba4bb843de
|
Merge pull request #5076 from umbraco/temp8-4521-umb-property-editor-css-width
4521 umb-property-editor css width-limitation
|
2019-04-12 13:56:31 +01:00 |
|
Warren Buckley
|
43fc926f1b
|
Merge pull request #5157 from umbraco/v8/bugfix/5129-ui-app-header-focus
V8: Visually more catching focus highlighting
|
2019-04-12 10:49:51 +01:00 |
|
Elitsa Marinovska
|
e06d18330c
|
Merge pull request #4721 from kjac/v8-fix-invalid-hostname
V8: Handle invalid hostnames
|
2019-04-12 11:38:03 +02:00 |
|
elitsa
|
fb3f2101f0
|
Merge branch 'v8/dev' into v8-fix-invalid-hostname
# Resolved Conflicts:
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
|
2019-04-12 11:27:43 +02:00 |
|
Warren Buckley
|
f8f28ec46a
|
Merge branch 'v8/dev' into v8/bugfix/5129-ui-app-header-focus
|
2019-04-12 09:40:02 +01:00 |
|
Elitsa Marinovska
|
6323dfcf9c
|
Merge pull request #5164 from kjac/v8-fix-navigation-partial-template
V8: Fix navigation partial view template
|
2019-04-12 10:00:39 +02:00 |
|
Elitsa Marinovska
|
108e3e527f
|
Merge pull request #5178 from kjac/v8-fix-content-type-matching-template-model
V8: Use the content type model when creating a "matching template"
|
2019-04-12 09:48:00 +02:00 |
|
elitsa
|
ebe4c1b3c3
|
Fixing formatting
|
2019-04-12 08:56:18 +02:00 |
|
Elitsa Marinovska
|
93f382fc0f
|
Merge pull request #5159 from poornimanayar/error-message-style-hostname
Fix the colour of the error message in the domains overlay
|
2019-04-12 08:52:46 +02:00 |
|
Stephan
|
8b509656cd
|
NuCache: fix vanishing content when refreshing content types
|
2019-04-11 18:55:40 +02:00 |
|
Kenn Jacobsen
|
a09e612e1f
|
V8: Fix the layout for editing datatypes in infinite edit mode (#5194)
### Prerequisites
- [x] I have added steps to test this contribution in the description below
If there's an existing issue for this PR then this fixes https://github.com/umbraco/Umbraco-CMS/issues/5154
### Description
This PR fixes the layout of the datatype editor when editing datatypes in infinite editing mode (see #5154 for details).
When applied the editor behaves like this:
|
2019-04-10 15:31:55 +02:00 |
|
Warren Buckley
|
a4e00b62b3
|
Merge pull request #5219 from umbraco/v8/bugfix/ui-doc-type-editor
bigger area for add-property + only hover-state if you can edit property
|
2019-04-10 14:09:03 +02:00 |
|
Niels Lyngsø
|
ed8ba3ddcf
|
changed inline-styling into a appearance property
|
2019-04-10 13:40:06 +02:00 |
|
Niels Lyngsø
|
43759fbef3
|
applied icons again
|
2019-04-10 12:10:01 +02:00 |
|
Niels Lyngsø
|
94334ff04f
|
style updates
|
2019-04-10 10:42:29 +02:00 |
|
Niels Lyngsø
|
1fcce288da
|
changed action into buttons for keyboard focus
|
2019-04-10 10:42:21 +02:00 |
|
Niels Lyngsø
|
5fbd455fd8
|
align description with title
|
2019-04-10 10:41:58 +02:00 |
|
Shannon Deminick
|
ff707e8768
|
Merge pull request #4960 from kjac/v8-fix-tree-dialog-remove-recycle-bin
V8: Don't show the recycle bin in tree pickers/dialogs
|
2019-04-10 09:50:42 +10:00 |
|
Stephan
|
e540a4ac23
|
IsVisible moves from publishde content to element
|
2019-04-09 21:24:55 +02:00 |
|
Stephan
|
ed4de5b000
|
Merge pull request #5041 from kjac/v8-feature-element-isvisible
V8: Add IsVisible extension on IPublishedElement
|
2019-04-09 21:20:37 +02:00 |
|
Niels Lyngsø
|
699c34263e
|
bigger area for add-property + only hover-state if you can edit property
|
2019-04-09 16:42:24 +02:00 |
|
Bjarke Berg
|
b29fd4ada3
|
Merge pull request #5192 from umbraco/v8/bugfix/5183-mapping-enumerables
Fix mapping of enumerable
|
2019-04-09 11:51:39 +02:00 |
|
Niels Lyngsø
|
8441d9017b
|
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/checkboxlist-fix
|
2019-04-09 08:54:02 +02:00 |
|
Shannon Deminick
|
980528c652
|
Merge pull request #5197 from redmorello/v8/dev
Fix spelling mistake in the Packages section of the back office
|
2019-04-09 10:33:10 +10:00 |
|
Shannon Deminick
|
0f6f7294a2
|
Merge pull request #5193 from kjac/v8-feature-donotcloneattribute-public
V8: Make DoNotCloneAttribute public
|
2019-04-09 10:25:52 +10:00 |
|
Stephan
|
6c8ded6275
|
Better mapping of enumerable
|
2019-04-08 16:41:33 +02:00 |
|
Ian Houghton
|
a90ae4ae28
|
Fix spelling mistake
|
2019-04-08 14:48:42 +01:00 |
|
Niels Lyngsø
|
968fc40622
|
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/checkboxlist-fix
|
2019-04-08 15:22:59 +02:00 |
|
Stephan
|
c4db0a3dc1
|
Merge pull request #5188 from kjac/v8-fix-relationtype-map-alias
V8: Relation type alias is "generating" when editing an existing relation type
|
2019-04-08 14:32:24 +02:00 |
|
Kenn Jacobsen
|
ceaae13575
|
Make DoNotCloneAttribute public
|
2019-04-08 10:39:37 +02:00 |
|
Stephan
|
9eb1415796
|
Fix mapping of enumerable
|
2019-04-08 10:05:21 +02:00 |
|
Stephan
|
091fae39a3
|
Merge pull request #5177 from kjac/v8-fix-entityslim-additionaldata-mapping
V8: Missing "metadata" breaks media picker (mapping issue)
|
2019-04-08 08:59:07 +02:00 |
|
Kenn Jacobsen
|
1aec0e1d9c
|
Fix exception types as per review
|
2019-04-08 07:24:56 +02:00 |
|
Kenn Jacobsen
|
22f43e67f5
|
Include relation type alias when mapping to RelationTypeDisplay
|
2019-04-07 20:13:39 +02:00 |
|
Stephan
|
b0ef69a4ec
|
Log more details about boot environment
|
2019-04-07 16:24:35 +02:00 |
|
Stephan
|
89b39be83f
|
Comment out dangerous methods
|
2019-04-07 12:59:59 +02:00 |
|
Stephan
|
ce89aa4857
|
Minor mapping fix
|
2019-04-07 12:56:11 +02:00 |
|
Stephan
|
6aeea47f6f
|
Minor fix
|
2019-04-07 11:27:34 +02:00 |
|
Stephan
|
8049c40f90
|
Stop exposing mapper in MapperContext
|
2019-04-07 11:26:47 +02:00 |
|
Stephan
|
1af431a27d
|
Merge pull request #5181 from kjac/v8-fix-variant-listview
V8: Fix YSOD on variant content listview
|
2019-04-07 10:34:01 +02:00 |
|
Stephan
|
814b8e3b7d
|
Merge pull request #5180 from kjac/v8-fix-save-variant-content
V8: YSOD when saving variant content (mapping issue)
|
2019-04-07 10:29:37 +02:00 |
|
Kenn Jacobsen
|
9326aac6d3
|
Pass the mapping context when mapping properties, to ensure that variant properties are mapped according to the current language context
|
2019-04-06 21:53:40 +02:00 |
|
Kenn Jacobsen
|
cb921b1fe2
|
Pass the mapping context when mapping properties, otherwise variant properties can't be mapped due to missing culture in mapping context
|
2019-04-06 21:39:16 +02:00 |
|
Stephan
|
9536a868e0
|
Fix erroneous log message when upgrading
|
2019-04-06 19:11:01 +02:00 |
|
Stephan
|
0a4465f721
|
Fix mapping comment
|
2019-04-06 18:35:07 +02:00 |
|
Stephan
|
9c06ef83e2
|
Merge pull request #5176 from kjac/v8-fix-map-usergroup-assignedusergrouppermissions
V8: Fix node permissions YSOD (mapping issue)
|
2019-04-06 18:33:04 +02:00 |
|
Kenn Jacobsen
|
f5ad4c67eb
|
Include AdditionalData when mapping IEntitySlim to EntityBasic
|
2019-04-06 12:24:41 +02:00 |
|
