yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,077 Commits 4 Branches 7 Tags
650ef397802a5282b61191783dab0d5eb41b5d00
Commit Graph

8717 Commits

Author SHA1 Message Date
Sebastiaan Janssen
650ef39780 Merge branch 'v8/dev' into v8/merge/5061-from-v7 2019-04-17 14:44:10 +02:00
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
Kenn Jacobsen
3668b68155 Merge with v8/dev 2019-04-16 11:48:20 +02:00
Kenn Jacobsen
52bc4b04b3 Fix annotation hover background color 2019-04-15 21:16:59 +02:00
Kenn Jacobsen
3f5ccb302d Make the tree annotations easier to see 2019-04-15 21:10:09 +02:00
Kenn Jacobsen
9953aea156 Make tree item annotation "has pending changes" take precendence over "is listview" 2019-04-14 21:03:24 +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
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
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
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:

![dataype-infinite-editing](https://user-images.githubusercontent.com/7405322/55711636-5df57780-59ed-11e9-958d-0deb05cb17bf.gif)
 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
Niels Lyngsø
699c34263e bigger area for add-property + only hover-state if you can edit property 2019-04-09 16:42:24 +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
Ian Houghton
a90ae4ae28 Fix spelling mistake 2019-04-08 14:48:42 +01:00
Kenn Jacobsen
2ee8f9dea2 Use the content type model when creating a "matching template" 2019-04-06 08:00:44 +02:00
Niels Lyngsø
ae853a178d Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/checkboxlist-fix 2019-04-05 14:02:21 +02:00
Niels Lyngsø
a4d8f0cd55 Fixing model sync, much weird code cleaned up 2019-04-05 14:01:28 +02:00
Bjarke Berg
9d9c201984 Merge pull request #5140 from umbraco/temp8-ui-use-umb-checkbox-for-select-all-in-listview 
Use umb-checkbox for select all in listview
 2019-04-05 11:33:10 +02:00
Niels Lyngsø
f141025248 Fixing checkbox list to work in v8 2019-04-05 09:43:27 +02:00
Niels Lyngsø
afad606d05 Changed umb-toggle look to fit with v8 2019-04-05 09:14:19 +02:00
Poornima Nayar
75bba068a4 Fix the colour of the error message in the domains overlay 2019-04-04 16:39:53 +02:00
Shannon
2e1dd7f4a9 splits appstate.service and editorstate.service 2019-04-05 00:11:05 +11:00
Niels Lyngsø
30da32ee94 Visually more catching focus highlighting 2019-04-04 14:15:57 +02:00
Shannon Deminick
984c31f586 Merge pull request #4955 from umbraco/temp8-server-content-validation-fixes-4884 
v8 - Fixes multiple issues with variant validation
 2019-04-04 22:15:26 +11:00
Kenn Jacobsen
2c6d400055 Various UX improvements to the RTE configuration (#5122) 2019-04-04 12:44:19 +02:00
Kenn Jacobsen
4a8449d80d Replace listview bulk action checkboxes with umb-toggle (#5128) 2019-04-04 11:47:03 +02:00
Stephan
dc337a60ac NuCache dashboard cosmetics 2019-04-04 11:08:33 +02:00
Stephan
f66e92801d Merge branch 'v8/dev' into temp8-server-content-validation-fixes-4884 2019-04-04 08:27:00 +02:00
Bjarke Berg
fd6368946c Merge pull request #5146 from umbraco/v8/bugfix/4811 
use text-overflow for better look in narrow screens
 2019-04-04 07:54:25 +02:00
Niels Lyngsø
8472b48ba8 use text-overflow for better look in narrow screens 2019-04-03 15:45:41 +02:00
Matt Darby
7568ab20ac Fix users layout jumping when a user is selected (#4939) 
* Remove "xs" sizing from selected user buttons
* Only remove "xs" from first button
 2019-04-03 15:31:09 +02:00
Niels Lyngsø
1ff67df9df Merge remote-tracking branch 'origin/v8/dev' into temp8-4521-umb-property-editor-css-width 2019-04-03 13:47:30 +02:00
Bjarke Berg
74bfaabf90 Added null-check before updating the count. (#5142) 2019-04-03 13:35:01 +02:00
Bjarke Berg
a0f5a466ac Merge pull request #5141 from umbraco/temp8-4427-3 
check if value exists
 2019-04-03 13:22:04 +02:00
Niels Lyngsø
2529193ca9 finished the work 2019-04-03 13:07:00 +02:00
Niels Lyngsø
92a68d3887 check if value exists 2019-04-03 12:46:55 +02:00
Stephan
e6b26d72e6 NuCache dashboard cosmetics 2019-04-03 11:57:45 +02:00
Bjarke Berg
a99c8ad2ba UI-Fix for readonly values on members. 2019-04-03 11:40:51 +02:00
Niels Lyngsø
9379efceae early testing 2019-04-03 11:22:00 +02:00
Shannon Deminick
a6fa23426e Merge pull request #5125 from kjac/v8-fix-members-disable-bulk-move 
V8: Don't allow move in members listview
 2019-04-03 16:21:10 +11:00
Shannon Deminick
b73d798b54 Merge pull request #5117 from kjac/v8-fix-listview-reload-after-move 
V8: Reload listview after moving items
 2019-04-03 10:44:00 +11:00