yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,270 Commits 4 Branches 7 Tags
114ab93a6a5ea3244c2afc3bd3ac7572f92b115f
Commit Graph

12283 Commits

Author SHA1 Message Date
Niels Lyngsø
8791c8dcc5 Merge branch 'v8/feature/reintroduce-tabs' of https://github.com/umbraco/Umbraco-CMS into v8/feature/reintroduce-tabs 2021-08-03 14:47:17 +02:00
Niels Lyngsø
d4b9ce6648 if alias is null, when we return null. needed for generic-tab 2021-08-03 14:47:07 +02:00
Mads Rasmussen
a5eeee038a render tabs in media section 2021-08-03 13:49:09 +02:00
Mads Rasmussen
1991174115 fix tab validation in content editor and block list editor after change to aliases 2021-08-03 12:55:24 +02:00
Niels Lyngsø
7cdae9f5c1 Merge branch 'v8/feature/reintroduce-tabs' of https://github.com/umbraco/Umbraco-CMS into v8/feature/reintroduce-tabs 2021-08-03 12:50:36 +02:00
Niels Lyngsø
d717556528 Add parentAlias for umbElementContentEditor 2021-08-03 12:50:26 +02:00
Ronald Barendse
6e5295eb0a Use localizeMany and update to arrow function expressions 2021-08-03 09:53:13 +02:00
Bjarke Berg
43ae1fa3e4 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_dev_03082021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/ContentEditing/ContentTypesByKeys.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-08-03 09:48:34 +02:00
Julia Gru
b070a36039 reset confirmDiscardChanges on save (#10777) 2021-08-02 15:11:42 +02:00
Ronald Barendse
daf2d7c946 Merge branch 'v8/contrib' into v8/feature/reintroduce-tabs and add fixes from #10150 and #10759 2021-08-02 11:35:39 +02:00
Kenn Jacobsen
d40e503c82 V8: Fix JS error when using the hide search function in treepicker (#6931) 
* Fix JS error when using the hide search function in treepicker

* updates with same defensive change from original pr - only explores child.children after confirming the child indeed has children

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-08-02 09:26:30 +10:00
Bjarne Fyrstenborg
d537545fa9 Use umb-icon component in user history 2021-08-02 09:14:15 +10:00
Bjarne Fyrstenborg
050cdd2bb0 Update icon in member group picker (#10094) 
* Use member group icon as default icon

* Make pickers consistent using member group entity icon

* Remove unused functions

* Use vm

* Use original getSelected() function

* Include clear function again

* Fix merge conflict

* Remove comment - remove function is requested from <umb-node-preview> in view

* Remove comment - wasn't used, but intend to use in PR 10096 to use property actions to clear member group picker
 2021-08-02 08:32:54 +10:00
Bjarne Fyrstenborg
d9555ea57c Update noUiSlider to v15.2.0 (#10319) 
* Upgrade to noUiSlider v15.1.1

* Configurate on drag event

* Update nouislider dependencies

* Update description

* Upgrade to latest noUISlider v15.2.0
 2021-08-02 08:31:41 +10:00
Bjarne Fyrstenborg
56790f72b0 Replace angular.forEach with Utilities.forEach (#10759) 
* Replace angular.forEach with Utilities.forEach

* Use localizeMany to localize translations in a single request

* Replace angular.forEach

* Replace angular.forEach in mocks
 2021-08-02 08:18:30 +10:00
Robert Ghafoor
168abbf2f7 10758 Caption will now be correctly set when passing in a target to the media picker. 2021-07-30 12:45:39 +01:00
Sebastiaan Janssen
905b43f8af Merge branch 'v8/dev' into v8/contrib 2021-07-29 10:22:36 +02:00
Sebastiaan Janssen
52e8237a0e Merge branch 'v8/8.15' into v8/dev 2021-07-29 10:22:10 +02:00
Bjarne Fyrstenborg
7f2b85da19 Don't squeeze avatar when help panel is open 2021-07-29 08:07:25 +10:00
Bjarne Fyrstenborg
8209525611 Modernize mini listview component to use svg icons and umb-search-filter component (#10740) 2021-07-27 15:49:16 +02:00
Sebastiaan Janssen
e8926ab17d Merge branch 'v8/8.14' into v8/8.15 2021-07-27 14:54:40 +02:00
Bjarne Fyrstenborg
f7529e0cf5 Inject windowResizeListener in Image Crop directive (#10745) 
(cherry picked from commit 2eb554f1b4)
 2021-07-27 14:53:09 +02:00
Bjarne Fyrstenborg
2eb554f1b4 Inject windowResizeListener in Image Crop directive (#10745) 2021-07-27 14:52:01 +02:00
Shannon
68737f8682 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 09:58:43 -06:00
Niels Lyngsø
ffb240c2c9 wrap add-tab in <li> 2021-07-23 14:30:02 +02:00
Niels Lyngsø
9807365800 Escape HTML in localization tokens. (#10729) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-07-23 14:26:12 +02:00
Niels Lyngsø
66cb8167db Merge remote-tracking branch 'origin/v8/dev' into v8/feature/reintroduce-tabs 2021-07-23 14:15:48 +02:00
Anders Bjerner
6116ec814d Update umbeditorview.directive.js 2021-07-23 09:32:51 +10:00
Bjarne Fyrstenborg
c812dab967 File upload checkered background (#10621) 
* Use umb-icon component

* Cleanup unused css and use checkered background on both image cropper and file upload
 2021-07-23 09:26:37 +10:00
Shannon
0f7e5a2f2f fix null auto link options. 2021-07-22 16:39:06 -06:00
Niels Lyngsø
fe9d0db763 10718 Enables more configured Blocks in Block List Editor (#10726) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-07-22 15:03:09 +02:00
Sebastiaan Janssen
d615c1e88b Merge branch 'v8/dev' into v8/contrib 2021-07-22 14:01:55 +02:00
Sebastiaan Janssen
ab0fcdfb9f Merge branch 'v8/8.14' into v8/8.15 2021-07-22 14:01:02 +02:00
Matt Brailsford
98266d462c Removes inert attribute when editorService.closeAll() is called 
Fixes #10708 by removing the `inert` attribute on `#mainWrapper` when `editorService.closeAll()` is called.

This code is necessary because when close all is called, there is no editor passed, and so `removeEditor` is never called, and so the `focusLockService.removeInertAttribute();` method isn't called. I add to the if block that handles the close all code instead.

(cherry picked from commit 1f4cc81af8)
 2021-07-22 13:59:33 +02:00
Matt Brailsford
1f4cc81af8 Removes inert attribute when editorService.closeAll() is called 
Fixes #10708 by removing the `inert` attribute on `#mainWrapper` when `editorService.closeAll()` is called.

This code is necessary because when close all is called, there is no editor passed, and so `removeEditor` is never called, and so the `focusLockService.removeInertAttribute();` method isn't called. I add to the if block that handles the close all code instead.
 2021-07-22 13:55:48 +02:00
Mole
615008c0ab Rename udi to id in EntityController.GetUrl 2021-07-22 11:10:02 +02:00
Niels Lyngsø
abe78a2be5 revert umb-tabs-nav-item and use val-tab for umb-tray-buttons 2021-07-20 13:28:02 +02:00
Niels Lyngsø
973b177624 prefix variables from attritbute-directive valTab with valTab_ 2021-07-20 12:30:22 +02:00
Niels Lyngsø
1f527b3152 umb-tabs-nav-item 2021-07-20 12:25:27 +02:00
Niels Lyngsø
fda8c6bc82 use white bar for doc type editor tabs 2021-07-20 12:22:21 +02:00
Sebastiaan Janssen
3a2a79108d Merge branch 'v8/dev' into v8/contrib 2021-07-20 10:23:29 +02:00
Sebastiaan Janssen
fce0bd0cfd Merge branch 'v8/8.14' into v8/8.15 
# Conflicts:
#	src/SolutionInfo.cs
 2021-07-20 10:17:40 +02:00
Niels Lyngsø
3def2ee2ad add vm.model.onValueChanged callback 
(cherry picked from commit 8ebb37a596)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
 2021-07-20 09:41:02 +02:00
Niels Lyngsø
8ebb37a596 add vm.model.onValueChanged callback 2021-07-20 09:37:29 +02:00
Niels Lyngsø
3739f34ec1 making overflow work 2021-07-19 16:04:44 +02:00
Niels Lyngsø
bc0f304556 dont move group if alias already exists in the context. 2021-07-19 15:33:44 +02:00
Niels Lyngsø
f10e0872d5 prevent changing alias of groups from other parents when typing names 2021-07-19 15:14:01 +02:00
Niels Lyngsø
481b4daced minor updates 2021-07-19 14:56:39 +02:00
Niels Lyngsø
7a1410f88f visual adjustments 2021-07-19 14:17:32 +02:00
Niels Lyngsø
917df60a39 styling adjustments 2021-07-16 11:15:40 +02:00