yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,176 Commits 4 Branches 7 Tags
06951d2e2e9f6056356d8d2361cd9c739e68fa0a
Commit Graph

39176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
06951d2e2e Fix for IPropertyCacheCompressionOptions registration 2021-08-03 10:01:13 +02:00
Bjarke Berg
e84fcd31a1 Moved namespaces 2021-08-03 09:58:41 +02:00
Bjarke Berg
4ab0b65238 post merge fix - Moved migration to infrastructure 2021-08-03 09:56:32 +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
Bjarke Berg
7cbe205472 Merge pull request #10742 from umbraco/v9/task/migrate-test-data 
Migrated Umbraco.TestData to .NET 5.
 2021-08-03 06:49:14 +02:00
Julia Gru
b070a36039 reset confirmDiscardChanges on save (#10777) 2021-08-02 15:11:42 +02:00
Zeegaan
1e20724882 Merge pull request #10676 from umbraco/v9/bugfix/image-upload 
V9: Fix drag and drop image upload
 2021-08-02 12:57:15 +02:00
Andy Butland
9957149008 Removed debug reference to test data from Umbraco.Web.UI.NetCore. 2021-08-02 09:31:45 +02:00
Sebastiaan Janssen
05973ecae8 Merge branch 'v8/8.15' into v8/dev 2021-07-29 14:10:09 +02:00
Sebastiaan Janssen
7c336554db Fix: Issue when upgraded from 8.14 to 8.15 when inviting user into the backoffice. #10746 (#10767) 
* Remove unusable method

* Fixes #10746 by removing the recursive call ending in an infinite loop

Also: the culture is already known, don't take the `CurrentUICulture`
(cherry picked from commit cb06442de4)
 2021-07-29 14:06:29 +02:00
Sebastiaan Janssen
52e8237a0e Merge branch 'v8/8.15' into v8/dev 2021-07-29 10:22:10 +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
Shannon Deminick
f1bc76e709 Merge pull request #10670 from cleversolutions/temp-10656 
Umbraco 9 - LoginProvider Duplicate Key
 2021-07-27 02:43:01 +10:00
Shannon Deminick
b1c4be4299 Merge pull request #10675 from cleversolutions/temp-10674 
Change the property accessed on the external provider from SocialIcon to Icon.
 2021-07-27 01:56:59 +10:00
Andy Butland
ab5272c6d3 Corrected comment. 2021-07-26 09:37:52 +02:00
Andy Butland
5bd00c8fc9 Migrated Umbraco.TestData to .NET 5. 2021-07-26 09:32:08 +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
Sebastiaan Janssen
175bb3e6df Bump version to 8.15.1 and merge branch 'v8/8.14' into v8/8.15 
# Conflicts:
#	src/SolutionInfo.cs
 2021-07-23 13:35:15 +02:00
Sebastiaan Janssen
071a89a59b Bump version to 8.14.2 2021-07-23 13:32:30 +02: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
1e13f3feea Merge branch 'v8/8.15' into v8/dev 2021-07-22 14:01:31 +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
32e11ec8dc Merge pull request #10713 from vsilvar/feature/10709-expose_IMvcBuilder_configuration_action 
Exposed MVC configuration action in AddBackOffice - #10709
 2021-07-22 10:28:24 +02:00
Warren Buckley
4df4b3eeaf Merge pull request #10603 from umbraco/v8/bugfix/creating-document-types-sqlce 
Fix duplicate ID when creating document types with SQL CE
 2021-07-21 12:11:22 +01:00
Sebastiaan Janssen
3feda1bc58 Merge branch 'v8/8.15' into v8/dev 2021-07-20 10:22:32 +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
Mole
4f4caeba6a Merge pull request #10691 from umbraco/v9/feature/package-manifest-bundle-options 
Adds bundle options to the package manifest
 2021-07-20 08:28:48 +02:00
Vitor Rodrigues
3f0a478974 Exposed MVC configuration action in AddBackOffice - #10709 2021-07-20 01:29:00 +02:00
Shannon
6118091da2 fixes css independent registration. 2021-07-19 16:34:32 -06:00
Mole
25e2016e82 Merge pull request #10652 from marcemarc/v9/bugfix/mediapickertypo 
Typo in DataTypeList Media Picke (legacy)
 2021-07-19 09:53:38 +02:00
Shannon Deminick
3757170043 Update src/Umbraco.Core/WebAssets/BundlingOptions.cs 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-07-17 02:13:56 +10:00
Shannon
c2d51f8d37 re-adds AppPluginsPath 2021-07-16 10:13:23 -06:00
Mole
eec3f0f421 Merge pull request #10692 from umbraco/v9/task/remove-old-projects 
Removes old projects
 2021-07-16 09:51:17 +02:00
Shannon
5549c446f7 try to fix build 2021-07-15 15:20:49 -06:00
Shannon
bb87c0156d removes Umbraco.Web.UI 2021-07-15 14:27:15 -06:00
Shannon
11cb1ef55d Removes Umbraco.Web. 2021-07-15 14:25:40 -06:00
Shannon
b16bf2f583 Adds BundlingOptions for better bundling support and moves all logic to the bundler (don't manually process urls). 2021-07-15 14:06:33 -06:00
Shannon
df9c4a0160 Adds bundle options to the package manifest 
to more control over how bundling works for static file processing for app_plugins
 2021-07-15 13:26:32 -06:00
Shannon
91d5820982 Fixes #10666 - CreateMemberWithIdentity was not working 2021-07-15 09:42:06 -06:00
Shannon Deminick
e2646e2864 Merge pull request #10685 from adamhearn/temp-10666 
Add integration test for MemberService::CreateMemberWithIdentity
 2021-07-16 01:19:24 +10:00
Shannon Deminick
e6a27a09dc Merge pull request #10686 from deMD/bugfix/applicationbuilder_nullcheck_order 
Moved nullcheck to top to catch possible nullreference exceptions
 2021-07-16 01:14:52 +10:00
Dave de Moel
62352fc1a6 Moved nullcheck to top to catch possible nullreference exceptions 2021-07-15 10:48:39 +02:00
Mole
a5ee8566b8 Merge pull request #10655 from umbraco/v9/task/supress-notifications 
Remove raiseEvent method parameters and allow suppressing events at the scope level
 2021-07-15 09:36:58 +02:00
Adam Hearn
883ad7d256 Added integration test for MemberService::CreateWithIdentity to highlight that whilst the method does not generate an error, no member is persisted 2021-07-15 01:05:54 +01:00
Shannon
2fc0fc6850 Removes CannotSuppressNotificationAttribute 2021-07-14 11:56:30 -06:00