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

39203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
c65cde38f7 Aligned the solution files 2021-08-04 12:51:40 +02:00
Bjarke Berg
bcb8c0e286 Fixed todo in test that is now possible after update of nunit 2021-08-04 12:51:25 +02:00
Bjarke Berg
8ad456a6d0 Test sqlCe integration tests on azure too 2021-08-04 12:50:49 +02:00
Bjarke Berg
e1dab63123 Merge remote-tracking branch 'origin/v9/dev' into patch-separate-sqlce-from-integration-tests 2021-08-04 10:50:33 +02:00
Bjarke Berg
d1a004078f Merge pull request #10781 from umbraco/v9/feature/merge_v8_dev_03082021 
V9: Merge v8/dev 03082021
 2021-08-04 10:40:34 +02:00
Nikolaj Geisle
9f1ed2b676 Merge pull request #10615 from umbraco/v9/bugfix/fix-get-local-crop-url 
V9: Fix GetLocalCropUrl
 2021-08-04 10:30:57 +02:00
Bjarke Berg
0de0b52354 Merge pull request #10785 from umbraco/v9/bugfix/10699/swapped_hashset_to_concurrent_hashset 
v9: Changed HashSet to ConcurrentHashSet to fix concurrency issues https://github.com/umbraco/Umbraco-CMS/issues/10699
 2021-08-04 09:51:11 +02:00
Bjarke Berg
30badd7d69 Fixed migration to support updating from 8.15rc (and before),8.15 final and 9.0rc1 2021-08-04 09:44:34 +02:00
Nikolaj Geisle
c7dd3b2461 Merge pull request #10688 from adamhearn/temp-10665 
Support member names using Down-Level Logon Name format
 2021-08-04 09:12:57 +02:00
Nikolaj Geisle
1b54013873 Merge pull request #10687 from umbraco/v9/bugfix/translations-everywhere 
V9: Fix translations not shown everywhere
 2021-08-03 14:52:00 +02:00
Bjarke Berg
a90b9dc052 Merge pull request #10784 from umbraco/v9/bugfix/10776/added_namespaces_to_view_imports 
v9: Added missing namespaces to viewimports https://github.com/umbrac…
 2021-08-03 14:28:21 +02:00
Zeegaan
338e1e0d6d https://github.com/umbraco/Umbraco-CMS/issues/10699 Changed HasSet<Uri> to ConcurrentHashSet<Uri> 
and changed Add method to TryAdd in AspNetCoreHostingEnviroment.EnsureApplicationMainUrl()
to fix concurrency errors
 2021-08-03 14:04:19 +02:00
Bjarke Berg
2229a3e7f8 Remove project references used to test 2021-08-03 13:18:27 +02:00
Zeegaan
d76044875b v9: Added missing namespaces to viewimports https://github.com/umbraco/Umbraco-CMS/issues/10776 2021-08-03 12:57:52 +02:00
Bjarke Berg
ac2f567f0e Still do ToArray as the first thing, to avoid test fails. 2021-08-03 12:29:15 +02:00
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
deMD
c1dcdfa634 Changed ConfigConnectionString to accept more valid connectionstrings (#10766) 
* Added test cases for valid connectionstring configuration and updated code to pass tests

* Removed unneeded reference added by reverted changes

Co-authored-by: Dave de Moel <d.demoel@wearetriple.com>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-08-03 10:04:49 +03: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
Lars-Erik
37066bb0e1 The rest of the internals. 🥳 2021-07-20 17:34:19 +02:00
Lars-Erik
053f1b2795 Moved the one remaining SqlCe dependant integration test into separate assembly. 2021-07-20 13:08:55 +02: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