Elitsa Marinovska
4bdb011b16
V9: Implementing Error Describers for translated error messages ( #10216 )
...
* Adding missing keys needed for the translation of the error describers' msgs
* Override all methods from IdentityErrorDescriber in order to provide our own translated error messages using our own translation engine (ILocalizedTextService)
* Fix tests
* Refactoring based on introducing an UmbracoErrorDescriberBase
* Remove unnecessary usings
2021-05-03 14:05:17 +02:00
Bjarke Berg
743f4a6610
https://github.com/umbraco/Umbraco-CMS/issues/10201 - Fix duplicate xml end tag
2021-04-29 17:30:07 +02:00
Mole
51a720b16c
Add references to Umbraco.Code as PrivateAsset ( #10148 )
...
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-04-27 09:07:10 +02:00
Shannon Deminick
39aeec0f1f
Implement password config storage for members ( #10170 )
...
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Updates user manager to correctly validate password hashing and injects the IBackOfficeUserPasswordChecker
* Merges PR
* Fixes up build and notes
* Implements security stamp and email confirmed for members, cleans up a bunch of repo/service level member groups stuff, shares user store code between members and users and fixes the user identity object so we arent' tracking both groups and roles.
* Security stamp for members is now working
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* merge changes
* oops
* Reducing and removing published member cache
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* oops didn't mean to comit this
* bah, far out this keeps getting recommitted. sorry
* cannot inject IPublishedMemberCache and cannot have IPublishedMember
* splits out files, fixes build
* fix tests
* removes membership provider classes
* removes membership provider classes
* updates the identity map definition
* reverts commented out lines
* reverts commented out lines
* Implements members Password config in db, fixes members cookie auth to not interfere with the back office cookie auth, fixes Startup sequence, fixes startup pipeline
* commits change to Startup
* Rename migration from `MemberTableColumns2` to `AddPasswordConfigToMemberTable`
* Fix test
* Fix tests, but adding default passwordConfig to members
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-04-22 15:59:13 +02:00
Bjarke Berg
4caa4e9e1c
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
2021-04-20 19:37:24 +02:00
Bjarke Berg
b3a9730442
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/MediaCacheRefresher.cs
# src/Umbraco.Core/Composing/ComponentCollection.cs
# src/Umbraco.Core/Composing/Composers.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Composing/TypeLoader.cs
# src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
# src/Umbraco.Core/Constants-SvgSanitizer.cs
# src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs
# src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
# src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/HealthChecks/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Core/HealthChecks/HealthCheckResults.cs
# src/Umbraco.Core/IO/FileSystems.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
# src/Umbraco.Core/Logging/DisposableTimer.cs
# src/Umbraco.Core/Logging/ILogger.cs
# src/Umbraco.Core/Logging/LogProfiler.cs
# src/Umbraco.Core/Logging/OwinLogger.cs
# src/Umbraco.Core/Manifest/ManifestWatcher.cs
# src/Umbraco.Core/Mapping/UmbracoMapper.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
# src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs
# src/Umbraco.Core/Models/Mapping/MacroMapDefinition.cs
# src/Umbraco.Core/Models/Member.cs
# src/Umbraco.Core/Packaging/PackageActionRunner.cs
# src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerPropertyEditor.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
# src/Umbraco.Core/Templates/HtmlUrlParser.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
# src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
# src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
# src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
# src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
# src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineNotificationHandler.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
# src/Umbraco.PublishedCache.NuCache/ContentStore.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
# src/Umbraco.Tests/Composing/TypeLoaderTests.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
# src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
# src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
# src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
# src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.Common/Install/InstallApiController.cs
# src/Umbraco.Web.Common/Macros/MacroRenderer.cs
# src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# 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/config/splashes/noNodes.aspx
# src/Umbraco.Web/AspNet/AspNetHttpContextAccessor.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/HttpUrlHelperExtensions.cs
# src/Umbraco.Web/HybridEventMessagesAccessor.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
# src/Umbraco.Web/Mvc/RenderMvcController.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
# src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/TempFileCleanup.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/MemberTreeController.cs
# src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
# src/Umbraco.Web/Trees/MemberTypeTreeController.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
# src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
# src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
2021-04-20 19:34:18 +02:00
Bjarke Berg
5afc509d5e
Fix member cached macros and change macro rendering to be async
2021-04-20 14:26:25 +02:00
Shannon Deminick
a1624d26a3
Implements Public Access in netcore ( #10137 )
...
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-04-20 07:11:45 +02:00
Shannon
5ce7127beb
Fixes remapping the key, allows for including/excluding custom properties on profile editing too.
2021-04-09 16:49:17 +10:00
Shannon
a745ef54a7
fix model binding and more stuff in views
2021-04-09 16:31:03 +10:00
Shannon
8ea88a980a
Fixes anti-forgery, fixes tempdata, adds front-end security/identity, gets member macro snippets and controllers all working, removes old code, adds more props to the member identity
2021-04-09 15:24:12 +10:00
Bjarke Berg
c41b05413a
Merge pull request #10044 from umbraco/netcore/feature/acceptance_tests_on_azure
...
Netcore: Run acceptance tests on azure pipelines
2021-03-24 12:30:57 +01:00
Mole
f3d1f39302
Merge pull request #10022 from umbraco/netcore/feature/package-dotnet-template
...
Netcore: Add package dotnet template and improved the templates
2021-03-24 09:42:19 +01:00
Bjarke Berg
68430c196e
Do not copy umbraco folder content to output folder. Only relevant for publish folder (as far as we know)
2021-03-24 09:41:29 +01:00
Bjarke Berg
b2a62c83bb
Update port
2021-03-22 10:14:45 +01:00
Kenn Jacobsen
a55a0c9e2d
Do not minify bundled CSS at runtime
2021-03-22 08:29:31 +01:00
Bjarke Berg
d55a484c56
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/IO/SystemDirectories.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Services/IIconService.cs
# src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
# src/Umbraco.Tests/Scoping/ScopeTests.cs
# src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
# src/Umbraco.Web/Editors/PreviewController.cs
2021-03-19 16:18:32 +01:00
Bjarke Berg
48eff10696
Merge pull request #9990 from umbraco/netcore/feature/in-memory-runtime-minifier
...
Ability to have an in-memory runtime minifier cache and configurable cache busters
2021-03-18 11:36:28 +01:00
Shannon Deminick
8c66470d65
Merge pull request #9902 from emmagarland/netcore/members-passwordchange-temp
...
Update to enable members to use the same password change as users
2021-03-18 17:40:19 +11:00
Shannon
36f911b66f
Ensure IsApproved is persisted with MembersUserStore, Update member done in a trans and in specific steps, calls to SetLockoutEndDateAsync more safely with time before now.
2021-03-18 15:57:53 +11:00
Shannon Deminick
cb3ea50a37
Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier
2021-03-17 18:00:26 +11:00
Shannon
a3b4bb7bd9
oops didn't mean to commit that
2021-03-17 17:56:40 +11:00
Shannon
1a2d8623e6
oops didn't mean to commit that
2021-03-17 17:55:45 +11:00
Shannon
eba659b9ee
Gets in-memory runtime minifiy cache working, ensures no files can be accessed at the root, adds config to enable in-memory and configure a cache buster including a timestamp cache buster.
2021-03-17 17:44:52 +11:00
Bjarke Berg
1a573fcb75
Review fixes https://github.com/umbraco/Umbraco-CMS/pull/9968
2021-03-16 10:44:55 +01:00
Shannon
2d14d0bd4a
oops didn't mean to commit that
2021-03-16 19:20:29 +11:00
Shannon
ecbd6d1c81
Adds better support for app_plugins loading assets in a safer way and without having to pass refs
2021-03-16 19:19:03 +11:00
Bjarke Berg
836f4a9203
Merge branch 'netcore/dev' into netcore/feature/9623-external-login-token-store
2021-03-16 09:15:53 +01:00
Bjarke Berg
a356584eb6
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store
...
# Conflicts:
# src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
2021-03-16 09:14:05 +01:00
Bjarke Berg
55de69b647
Merge pull request #9961 from umbraco/netcore/feature/appsettings-local
...
Allow for having appsettings.local.json
2021-03-16 09:12:13 +01:00
Bjarke Berg
375609bc6e
Update src/Umbraco.Web.UI.NetCore/appsettings.json
2021-03-16 08:05:33 +01:00
Shannon
670bea81d1
Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier
...
# Conflicts:
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-16 17:49:05 +11:00
Shannon
e993410d2c
Merge branch 'netcore/bug/minify-plugins' of https://github.com/kjac/Umbraco-CMS into kjac-netcore/bug/minify-plugins
...
# Conflicts:
# src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-16 17:22:25 +11:00
Bjarke Berg
b94cc517fc
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store
...
# Conflicts:
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
2021-03-12 13:04:46 +01:00
Bjarke Berg
2b89839724
Netcore: Get rid of default files in config folder ( #9966 )
...
* TourController now uses the core tours from embedded resources
* Moved tinyMceConfig.*.config to IOptions
* Embedded the default grid.editors.config.js
* Fixed issue when saving grid with an empty media cell
* Logviewer now uses sql as database instead of file.
* Remove config folder from build script and nuget pacakges.
* Removing auto-generated Id added to appsettings.json
* Update src/Umbraco.Web.BackOffice/Controllers/TourController.cs
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk >
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com >
2021-03-11 13:20:46 +01:00
Shannon
e4807c2430
New table and service to store auth tokens
...
Implements the auth token retrieval and storage for the identity implementation. This is now automatically done for providers and the back office user manager can be used to retreive and store all tokens.
Fixes locking on the config writer.
Removes the abstract NodeObjectTypeId from the base repo since it shouldn't be there.
2021-03-11 19:35:43 +11:00
Shannon Deminick
e6f73b26ce
Update src/Umbraco.Web.UI.NetCore/appsettings.json
2021-03-11 14:09:23 +11:00
Elitsa Marinovska
63d7d23cd7
Revert changes to default appsettings.json
2021-03-10 14:42:31 +01:00
Bjarke Berg
8bc637090e
Error handling issue fix
...
Add the option to configure some pipeline that executes before Umbraco in the StartupFilter. AB10786
2021-03-10 12:50:27 +01:00
Shannon
52812672fc
Allow for having appsettings.Local.json
...
this file is not checked in and can be used to overwrite any custom settings that are in the repo without worrying about accidentally checking in developer settings as you work.
2021-03-10 15:22:45 +11:00
Bjarke Berg
d81874aee3
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021
...
# Conflicts:
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
2021-03-09 09:31:55 +01:00
Bjarke Berg
37ed84871a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/CacheKeys.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/Extensions/UriExtensions.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Media/Exif/MathEx.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/Membership/User.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
# src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
# src/Umbraco.Core/Routing/AliasUrlProvider.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UriUtility.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/RuntimeOptions.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Security/BackOfficeUserStore.cs
# src/Umbraco.Core/Security/ContentPermissions.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Trees/TreeNode.cs
# src/Umbraco.Core/Udi.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
# src/Umbraco.Tests/Testing/TestDatabase.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
# src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
# src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TourController.cs
# src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# 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/config/umbracoSettings.Release.config
# src/Umbraco.Web/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/Logging/WebProfiler.cs
# src/Umbraco.Web/Logging/WebProfilerProvider.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/JsonNetResult.cs
# src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/RoutableDocumentFilter.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/DictionaryTreeController.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
# src/Umbraco.Web/Trees/LogViewerTreeController.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
# src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
# src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
2021-03-05 15:36:27 +01:00
Shannon
d72c11821f
Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
...
# Conflicts:
# src/Umbraco.Core/HybridAccessorBase.cs
# src/Umbraco.Core/Security/IBackOfficeSecurityFactory.cs
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs
2021-03-04 16:57:32 +11:00
Shannon
2d0389d53c
Updates project dependencies to latest patch releases, removes Umbraco.Code from Umbraco.Web since it was causing conflicts for some reason - finally these conflict errors are gone.
2021-03-04 14:10:10 +11:00
Bjarke Berg
c3d6cc0dcd
Revert test view component
2021-03-03 07:09:49 +01:00
Bjarke Berg
1c50ece986
Use c#9 + namespace fix
2021-03-02 16:20:44 +01:00
Shannon
3113efd122
Adds common.views to view imports
2021-02-26 14:11:00 +11:00
Shannon
b21db82929
missed change for default namespace in the UI project
2021-02-26 14:08:57 +11:00
Mole
159747ab61
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
# src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
# src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Infrastructure/Security/IBackOfficeUserManager.cs
# src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
# src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
# src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
# src/Umbraco.Infrastructure/Security/UserInviteEventArgs.cs
# src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
# src/Umbraco.Web/Security/IBackOfficeUserPasswordChecker.cs
# src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
2021-02-23 08:51:09 +01:00
Emma Garland
c35af99030
Reverted appsettings
2021-02-22 20:57:41 +00:00
