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

929 Commits

Author SHA1 Message Date
Zeegaan
33ab3a32ec Merged v9/dev into this branch 2021-08-16 10:41:36 +02:00
Bjarke Berg
3c6efa6cb5 Merge pull request #10787 from umbraco/v9/bugfix/member_validation_doesnt_update_properly 
v9: Fixed a bug where validation didnt update properly
 2021-08-13 19:19:37 +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
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
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
Zeegaan
c07fe97edd Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/Refractor_UmbracoContextAccessor 2021-08-11 14:01:00 +02:00
Zeegaan
81807f76dc Fixed last 4 classes that used old UmbracoContextAccessor to use new TryGetUmbracoContext 2021-08-11 13:33:34 +02:00
Zeegaan
f299c6a93b Updated 15 classes to use the new TryGetUmbracoContext and implemented a Set() method in HybridUmbracoContextAccessor 2021-08-11 13:25:17 +02: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
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
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
7859798e8b Move basic auth to website part 2021-08-06 11:37:10 +02:00
Bjarke Berg
bbd935a0b8 Updates based on review feedback 2021-08-06 11:26:31 +02:00
Bjarke Berg
aaf28cba21 Update src/Umbraco.Web.BackOffice/Middleware/BasicAuthAuthenticationMiddleware.cs 
Co-authored-by: Andy Butland <abutland73@gmail.com>
 2021-08-06 11:00:27 +02:00
Bjarke Berg
0e7f9d93ca Introduced IBasicAuthService 2021-08-06 09:51:08 +02:00
Bjarke Berg
4f2cb09939 Added POC of basic auth middleware 2021-08-05 21:42:47 +02:00
Nikolaj Geisle
61b343da8b Merge pull request #10722 from umbraco/v9/bugfix/fix-multi-url-picker 
V9: Fix multi url picker
 2021-08-05 08:11:31 +02:00
Elitsa Marinovska
c8d848bd48 Limiting the access to other folders which are not serving static content when selecting a thumbnail for a Block List and if the image is located under the webroot folder, remove the "wwwroot" prefix from the thumbnail path 2021-08-05 09:04:46 +03: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
Zeegaan
d11b79421d fixed a bug where validation didnt update properly 
adressed in
https://github.com/umbraco/Umbraco-CMS/pull/10688
 2021-08-04 09:46:01 +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
e84fcd31a1 Moved namespaces 2021-08-03 09:58:41 +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
Shannon
5cec6ab8f4 Fixes issue with resolving a scheme name since that is managed via IOptions but we were capturing it. 2021-07-27 16:12:23 -06:00
Shannon
d218cb4599 Fixes migration and redirect 2021-07-26 16:55:41 -06:00
Shannon
a89a92efea Fixing upgrade redirect when using external providers. 2021-07-26 13:28:18 -06:00
Shannon
27fc159e28 ensures the last login date, etc... are updated with external logins 2021-07-26 13:12:29 -06:00
Shannon
c8d36cfc4f Fix ordering of css files and set correct defautl icon for external providers. 2021-07-26 11:10:37 -06:00
Shannon
68737f8682 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 09:58:43 -06:00
Shannon
86dea11711 chagen to IOptionsMonitor 2021-07-26 08:58:23 -06:00
Shannon
0f7e5a2f2f fix null auto link options. 2021-07-22 16:39:06 -06:00
Shannon
9ec86f2f86 create scope to resolve named options. 2021-07-22 14:47:17 -06:00
Shannon
560d49d6a5 create scope to resolve named options. 2021-07-22 14:33:32 -06:00
Shannon
c3953bb0c1 Ensure to resolve the named options 2021-07-22 13:54:46 -06:00
Mole
615008c0ab Rename udi to id in EntityController.GetUrl 2021-07-22 11:10:02 +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
Shannon
7280c22e0a Changes BackOfficeExternalLoginProviderOptions to use the IOptions pattern with named options so they can be set after DI. 2021-07-21 14:53:25 -06:00
Shannon
1155210209 Fixes error reporting for external login 2021-07-21 14:32:55 -06:00
Vitor Rodrigues
3f0a478974 Exposed MVC configuration action in AddBackOffice - #10709 2021-07-20 01:29:00 +02:00
Shannon
ab66a9f33c Adds new method WithCustomDefaultMiddleware 
To be able to fully customize the default middleware pipeline. Renames some interfaces and methods to be more consistent. Changes the startup builder interface types to be more type safe.
 2021-07-16 16:04:14 -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
Mole
33f53fcf35 Force authentication of user when getting localized text and get culture from user identity 2021-07-15 14:10:52 +02:00
Shannon Deminick
994e67aeea Merge pull request #10657 from umbraco/v9/task/lazy-collections 
Changes all collections from collection builders to resolve the concrete instances lazily.
 2021-07-15 03:46:16 +10:00
Mole
5cd0545b2f Tweak xml header 2021-07-14 14:27:36 +02:00
Mole
2ea40a103a Make ValidationProblem methods unambiguous 2021-07-14 14:18:22 +02:00