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

39384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
765f650d08 Merge pull request #10835 from umbraco/v9/feature/merge_v8_11082021 
Merge V8.16RC into V9 11-08-2021
 2021-08-11 20:13:58 +02:00
Bjarke Berg
d775de5ddd Fixed issue after merge 2021-08-11 19:38:23 +02:00
Bjarke Berg
2baa1abfc4 Merge remote-tracking branch 'origin/v8/8.16' into v9/feature/merge_v8_11082021 
# Conflicts:
#	.github/CONTRIBUTING.md
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Cache/AppCaches.cs
#	src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs
#	src/Umbraco.Core/Cache/DeepCloneAppCache.cs
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/PropertyGroupCollection.cs
#	src/Umbraco.Core/Models/PropertyTypeCollection.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Core/ReadLock.cs
#	src/Umbraco.Core/Routing/SiteDomainMapper.cs
#	src/Umbraco.Core/UpgradeableReadLock.cs
#	src/Umbraco.Core/WriteLock.cs
#	src/Umbraco.Examine/ExamineExtensions.cs
#	src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
#	src/Umbraco.Infrastructure/Persistence/Dtos/ContentTypeDto.cs
#	src/Umbraco.Infrastructure/Persistence/Dtos/DictionaryDto.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
#	src/Umbraco.Infrastructure/Services/IdKeyMap.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/CacheHelperExtensions.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Logging/WebProfilerProvider.cs
#	src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
#	src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
#	src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2021-08-11 19:11:35 +02:00
Bjarke Berg
c5e882680b Fixed issue with model state marked as invalid on the entire model, where we handle it for each item separately 2021-08-11 15:43:41 +02:00
Bjarke Berg
dfa76af4d6 Merge remote-tracking branch 'origin/v9/dev' into v9/dev 2021-08-11 14:50:56 +02:00
Bjarke Berg
c5752b5db5 Revert "Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8" 
This reverts commit 5ae0b64b36.
 2021-08-11 14:50:39 +02:00
Nikolaj Geisle
6be555f85a Merge pull request #10832 from umbraco/v9/bugfix/cached_partial_did_not_materialize_before_caching 
Fixed issue with CachedPartial that cached an unmaterialized value
 2021-08-11 14:42:25 +02:00
Bjarke Berg
805a228e6b Merge remote-tracking branch 'origin/v9/dev' into v9/dev 2021-08-11 14:32:35 +02:00
Bjarke Berg
5ae0b64b36 Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8 2021-08-11 14:32:08 +02:00
Bjarke Berg
442310d0ea Fixed issue with CachedPartial that cached an unmaterialized value, that could not be used on cache hits. 2021-08-11 13:59:28 +02:00
Warren Buckley
558352e3ac Merge pull request #10823 from umbraco/v9/feature/package_export_and_import_both_xml_and_zip 
V9: Package export and import both xml and zip
 2021-08-11 11:10:28 +01:00
Bjarke Berg
c2d54f508f Fixed missing TODO 2021-08-11 11:30:47 +02:00
Bjarke Berg
53fc1693ec Fix duplicate ProjectReference to Umbraco.Web.Common 2021-08-11 10:39:58 +02:00
Shannon Deminick
962984b9c9 Merge pull request #10702 from umbraco/v9/task/more-flexible-startup 
More flexible Umbraco startup code - new method WithCustomMiddleware
 2021-08-11 06:26:03 +10:00
Shannon
01dd9e6f2e Merge branch 'v9/dev' into v9/task/more-flexible-startup 
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
 2021-08-10 13:55:55 -06:00
Shannon
652f385057 Merge branch 'v9/bugfix/external-login-changes' into v9/dev 2021-08-10 12:42:32 -06:00
Shannon
1917c51115 Another fix required for the user invite flow. 2021-08-10 12:41:24 -06:00
Bjarke Berg
d520be52bc Merge pull request #10721 from umbraco/v9/bugfix/external-login-changes 
external login changes/enhancements
 2021-08-10 20:04:20 +02:00
Bjarke Berg
cfc9450940 Do not show build information on Upgrade page 2021-08-10 19:31:27 +02:00
Bjarke Berg
2add0833bc Merge pull request #10824 from umbraco/v9/serilog-remove-old-xml-settings-nuget 
V9 Serilog - Remove old XML settings nuget
 2021-08-10 14:54:05 +02:00
Warren Buckley
73daca339e Adds in System.Configuration.ConfigurationManager that the Serilog package had a dependacy on 2021-08-10 11:45:53 +01:00
Bjarke Berg
2b8256c576 Fix hash of xml 2021-08-10 12:40:24 +02:00
Warren Buckley
66194fe553 Remove unused usings 2021-08-10 10:19:29 +01:00
Warren Buckley
b82047ce00 Fix build & remove this constructor where you could pass in a custom filepath to read the XML settings from 2021-08-10 10:19:13 +01:00
Warren Buckley
2b36538b71 Uninstall OLD Serilog package that read config from XML values we use Serilog.Settings.Configuration instead now 2021-08-10 10:18:33 +01:00
Bjarke Berg
3ac5004d09 Fixed issue: 
Did not load media items if the folder was still there but the nested media was deleted/missing

## Testcase:
Add folder to media..

add multiple images into the folder

Create package with the folder and include decendents

Remove one of the items inside the folder + empty recycle bin

Install the package  - Now the missing item is still added (it was not before)
 2021-08-10 10:52:26 +02:00
Paul Johnson
5c1712cba2 Stopped building frontend assets to Umbraco.Web.UI/ 2021-08-10 09:16:52 +01:00
Paul Johnson
4b73c44700 Remove duplicate project entry for examine in netcore-only sln 2021-08-10 09:34:07 +02:00
Bjarke Berg
74c20f6d96 Merge pull request #10811 from umbraco/v9/bugfix/null-check-redirect-tracking 
Needs a null check so it doesn't explode when saving content during a migration.
 2021-08-10 07:56:13 +02:00
Shannon
456e352491 Fix build 2021-08-09 13:42:52 -06:00
Shannon
ab84490535 Fixes email sending notifications so they are checked if they are handled. 2021-08-09 13:42:08 -06:00
Bjarke Berg
fb9fdc44ca Merge pull request #10818 from p-m-j/v9/bugfix/misc-linux-issues 
v9: Run all tests on linux build
 2021-08-09 17:22:35 +02:00
Paul Johnson
7f71298e3f Remove apartment state annotations 
Resolves issue where fewer test run on Linux than Windows.
Presumably legacy that has hung around.
 2021-08-09 15:49:56 +01:00
Paul Johnson
a2799738ca Fix nuspec solution items 2021-08-09 14:40:16 +01:00
Paul Johnson
38e66b0124 Fix case sensitivity issue 2021-08-09 14:34:32 +01:00
Bjarke Berg
c190ed504e fix tests 2021-08-09 13:19:37 +02:00
Nikolaj Geisle
18ef926c5e Merge pull request #10796 from umbraco/v9/bugfix/AB13096-remove-unwanted-folders-on-publish 
V9: Umbraco Templates - remove unwanted folders on publish
 2021-08-09 11:08:57 +02:00
Nikolaj Geisle
c03e84689d Merge pull request #10794 from umbraco/v9/bugfix/AB13095-block-thumbnail-fix 
V9: Limit the BlockList thumbnail picker to only the directories serving static files
 2021-08-09 08:54:23 +02:00
Sebastiaan Janssen
9b93a8f1ab Bump version to 8.16.0-rc 2021-08-09 08:26:22 +02:00
Bjarke Berg
6ef2deb3cb Fix base url for js docs 2021-08-09 07:48:37 +02:00
Bjarke Berg
2a3ac1961d Temp commit 2021-08-09 06:28:26 +02:00
Shannon
afb952fa38 Needs a null check so it doesn't explode when saving content during a migration. 2021-08-06 15:54:50 -06:00
Shannon
d4be031b78 Fixes an error caused by v8-v9 merge 2021-08-06 14:12:25 -06:00
Shannon
53bc53a377 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
 2021-08-06 13:47:41 -06:00
Bjarke Berg
a159aa4790 Merge pull request #10808 from abjerner/v9/bugfix/typefinder-jetbrains-annotations 
v9: Added "JetBrains.Annotations" to assembly exclusion list to fix #10801
 2021-08-06 19:19:10 +02:00
Kevin Meilander
1dd75b9051 #10354 - added domain content id as node context for the content finder for the 404 error page so $site works 2021-08-06 16:33:57 +02:00
Adam Nelson
0bc9f3e322 Fix textboxes inside flatpickr popup to not cause the scheduled publishing overlay to submit when enter is pressed. 2021-08-06 16:31:21 +02:00
Sebastiaan Janssen
33e980841f Update to latest flatpickr 2021-08-06 16:27:07 +02:00
Philippe Guilmette
19a6184502 Delete entries from umbracoUserLogin before deleting the user (fix for 10269) 2021-08-06 16:14:32 +02:00
Sebastiaan Janssen
f7dee7ec74 Fix self-closing element 2021-08-06 15:55:50 +02:00