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

10252 Commits

Author SHA1 Message Date
Bjarke Berg
1ea39f2762 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs
 2020-03-02 08:34:52 +01:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Sebastiaan Janssen
67168068f6 Merge branch 'v8/contrib' into pr/7449 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2020-02-25 22:12:37 +01:00
Kenn Jacobsen
7d0c5508da Rollback breaks for non-string property values 2020-02-25 21:54:34 +01:00
Kenn Jacobsen
50ab5ce79b Open rollback in a medium sized panel 2020-02-25 21:53:41 +01:00
Kenn Jacobsen
044dc4eb98 Only show culture for content links if there is more than one culture 2020-02-25 21:51:31 +01:00
Kenn Jacobsen
ea29eb993c Align "Field is mandatory" label with the actual toggle 2020-02-25 21:50:30 +01:00
Kenn Jacobsen
5e155a871c Fix the create dialog on empty installs 2020-02-25 21:42:37 +01:00
Kenn Jacobsen
f4cd1c2f0c Fix JS errors for Nested Content in single mode 2020-02-25 21:28:40 +01:00
Warren Buckley
aa8e2b0859 Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a)
 2020-02-25 13:08:22 +00:00
Warren Buckley
4acddb288a Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
 2020-02-25 13:07:34 +00:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +01:00
Warren Buckley
a65bf08f1a Merge pull request #7630 from kjac/v8/fix/nested-content-single-mode-add-more-than-one 
V8: Nested Content can't add multiple items
 2020-02-25 09:43:56 +00:00
Kenn Jacobsen
69b3bc6fc7 V8: Remove create option in listviews for deleted content (#7655) 2020-02-24 18:46:36 +00:00
Kenn Jacobsen
23f8c3e474 V8: Correct cursor for list view search icon (#7656) 2020-02-24 18:28:11 +00:00
Warren Buckley
4275401c4b Merge pull request #7654 from kjac/v8/fix/recycle-bin-without-mculture 
V8: Ensure that the recycle bin doesn't delete content at root
 2020-02-24 15:50:13 +00:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
 2020-02-24 15:11:58 +00:00
Kenn Jacobsen
2b103f539d Fix overlays in fullscreen RTE (#7697) 2020-02-24 14:06:18 +00:00
Jeavon
5efeb53805 Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700) 2020-02-24 11:11:33 +00:00
Nathan Woulfe
51481bbe3a Update editor.service.js (#7703) 
fix ngdoc description for templateEditor fn
 2020-02-24 10:35:46 +00:00
Niels Lyngsø
fcc079111d Slightly brigther disable state 2020-02-22 20:01:16 +01:00
Nathan Woulfe
d65b8f14ba add pointer-events:none on disabled checkbox/radio 2020-02-22 12:02:50 +01:00
Kenn Jacobsen
634741e35b Make sure mculture is set after logout and login 2020-02-20 19:56:33 +01:00
Bjarke Berg
e6c315ff69 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Editors/UpdateCheckController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:06:37 +01:00
Bjarke Berg
4ca4d8e6e0 Merge pull request #7684 from umbraco/v8/feature/AB4953-change-webservice-to-rest 
Change web service invocation to new Our rest endpoints
 2020-02-20 08:02:38 +01:00
Nathan Woulfe
65750d2b32 fixes regression where validation object doesn't always exist on the property, depending on context 2020-02-20 08:59:46 +10:00
Kenn Jacobsen
64cffcb967 Fix Nested Content JS errors when enforcing min items (#7628) 2020-02-19 13:10:21 +00:00
Niels Lyngsø
278f8cc99f css change 2020-02-19 10:13:51 +01:00
Niels Lyngsø
088c51e84d enabling transclude for umb-form-check 2020-02-19 09:36:33 +01:00
Bjarke Berg
9ed94f753d Fixed issue with wrong installId in cookie. + Refactored to not use Newtonsoft.Json + Minor renames 2020-02-19 08:32:47 +01:00
Poornima Nayar
9e2a471e5d Merge pull request #7662 from nathanwoulfe/7647-clear-validation-after-clearing-property 
v8: 7647 Can't save content after clearing property with validation error
 2020-02-18 10:53:07 +00:00
Poornima Nayar
cc9e0f45a8 Merge pull request #6962 from kjac/v8/fix/upload-imagecropper-styling 
V8: Styling updates to image cropper and upload property editors
 2020-02-17 09:42:05 +00:00
Poornima Nayar
00d3dd3e48 Merge pull request #6988 from kjac/v8/fix/hide-breadcrumb-for-recycle-bin-children 
V8: Do not show the breadcrumb for immediate children in the recycle bin
 2020-02-17 09:12:08 +00:00
Poornima Nayar
49217df95d CSS class added to the h3 on members dashboard 2020-02-15 15:08:55 +00:00
Aleksandr Šmailov
67e182bdbf Updated content controller to hide save button (#7318) 2020-02-14 12:37:20 +01:00
Nathan Woulfe
c362c00758 I think it's fixed, needs thorough testing... 2020-02-14 16:22:02 +10:00
Kenn Jacobsen
8370c5b42f Ensure that the recycle bin doesn't delete content at root 2020-02-13 11:20:53 +01:00
Niels Lyngsø
b3e88040ec 7285 making property actions show on focus within (#7287) 2020-02-13 09:29:15 +01:00
Poornima Nayar
68ee537520 Accessibility improvements to user group screen (#7414) 2020-02-13 09:10:06 +01:00
ksingercoffey
5307a8cf13 #7643: add type="button" to prevent default clicks by pressing Enter (#7651) 2020-02-13 07:41:19 +01:00
Bjarne Fyrstenborg
450a77fff5 Missing onClose for tour (#7595) 2020-02-12 15:21:03 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2020-02-11 16:53:13 -08:00
Niels Lyngsø
2fc495128e make icon of umb-preview-node align vertically. 2020-02-11 21:48:28 +01:00
Mark Drake
3296021907 Add an Active State for Expand (...) in the Top Section Navigation 2020-02-11 21:10:28 +01:00
Bjarne Fyrstenborg
53ca5eec88 Adjust child selector sorting (#7582) 
* Only add move cursor to sortable child elements

* Don't sort add button

* Add missing docs for onSort

* Change add button to use button element

* Use button element for remove button and add aria-hidden to icons

* Reset styling of button element

* Ensure add button is full width

* Remove unnecessary cursor styles since these now inherit from button element
 2020-02-11 20:36:42 +01:00
Steve Megson
b2141b6657 Slider format function should return a number 2020-02-11 20:25:44 +01:00
Bjarne Fyrstenborg
4ff91ed4d1 Use button element in user detail and user group views (#7584) 
* Use button element on user detail page

* Use button element on user group page
 2020-02-11 20:15:22 +01:00
Benjamin Carleski
c63af8e161 Merge pull request #7616 from umbraco/temp-7538-image-url-generator 
Introduce Image URL Generator abstraction
 2020-02-11 10:30:48 -08:00
Niels Lyngsø
355fe6be21 Remember user filtering 2020-02-11 12:12:01 +01:00
Niels Lyngsø
72ff7ab8f1 on blur event for umb-mini-search 2020-02-11 12:11:32 +01:00