yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,789 Commits 4 Branches 7 Tags
5c6b8fe2bc36a9348ac88b469fdb3e1ca8a2a42a
Commit Graph

753 Commits

Author SHA1 Message Date
Emma Garland
5c6b8fe2bc Added security logic previously added to PasswordChanger 2021-03-15 09:01:10 +00:00
Emma Garland
aa4947913e Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
 2021-03-12 14:29:35 +00:00
Bjarke Berg
d777d7dded Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 13:48:14 +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
Bjarke Berg
8d743cbe2c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 10:33:48 +01:00
Bjarke Berg
91e877cebe Merge pull request #9849 from kjac/netcore/bug/preview 
Preview does display draft versions
 2021-03-11 08:41:21 +01:00
Elitsa Marinovska
1e480abfc8 Remove duplicated TreeAccessDocumentTypes policy and fixed the one for TreeAccessDictionary 2021-03-10 14:40:25 +01:00
Bjarke Berg
bec0e09aed Update src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs 2021-03-10 07:26:46 +01:00
Shannon
87749b5078 Ensures claims continue to flow even after the security stamp validator executes. 2021-03-10 14:46:51 +11:00
Bjarke Berg
1aa8d3aa09 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-05032021 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
 2021-03-09 10:08:53 +01: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
a86054e487 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021 2021-03-08 07:01:19 +01:00
Shannon
8c88c3e00f Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope 
# Conflicts:
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-03-08 13:33:07 +11:00
Warren Buckley
c57a9b9d3b Merge remote-tracking branch 'origin/netcore/dev' into netcore/unattended-user-create 2021-03-05 17:25:57 +00:00
Warren Buckley
86fff278c6 Update src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs 2021-03-05 17:15:53 +00:00
Bjarke Berg
ec1d3dd43d Revert test values 2021-03-05 15:47:33 +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
Mole
d505c85551 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-05 14:07:16 +01:00
Mole
f5df05d685 Add metadata to all packages and rename UmbracoCms.Lucene.nuspec to UmbracoCms.Examine.Lucene.nuspec 2021-03-05 13:56:41 +01:00
Mole
390cf6ca66 Pack all projects as individual packages and add them as dependency 
Only have to add Umbraco.Cms.Web.Website and Umbraco.Cms.Web.BackOffice, rest will be indirect dependencies.
 2021-03-04 14:10:55 +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 Deminick
0daad54d7f Merge pull request #9915 from umbraco/netcore/task/9726-fixing-macros 
Fixing macro rendering with forms
 2021-03-04 16:48:24 +11:00
Shannon
1163e7aa3b Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope 2021-03-04 14:49:56 +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
Warren Buckley
aa9ff2e670 The event fires and hits the Handle in the notification/event handler 
But it implodes when I inject/add UserManager to this
 2021-03-03 16:31:17 +00:00
Shannon
dfc202a6c8 init code cleanup 2021-03-03 09:56:34 +11:00
Bjarke Berg
1c50ece986 Use c#9 + namespace fix 2021-03-02 16:20:44 +01:00
Bjarke Berg
4d5c7988cf Merge pull request #9892 from kjac/netcore/feature/remove-editormodel-static-events 
Replace static editor model events events with IEventAggregator notifications
 2021-03-01 14:15:54 +01:00
Kenn Jacobsen
e407d083c2 Resolved merge conflicts with netcore/dev 2021-03-01 13:26:34 +01:00
Kenn Jacobsen
0bdd1cc874 Replaced if/else with switch 2021-03-01 13:17:24 +01:00
Bjarke Berg
a67f7fad6f Merge pull request #9881 from kjac/netcore/feature/remove-treecontroller-static-events 
Replace static events in TreeControllerBase with IEventAggregator notifications
 2021-03-01 10:24:20 +01:00
emmagarland
d67f4d7ec1 Added failed password test result 2021-02-28 19:09:02 +00:00
emmagarland
c84564f0d6 Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 2021-02-28 17:05:59 +00:00
berg
d7d99e5c00 Fixed issue found by cypress test. script/css folders was not deleted because it search in contentroot and not wwwroot 2021-02-27 19:26:36 +01:00
Emma Garland
dee74f4c44 Updated member after password changed on identity member 2021-02-26 15:29:44 +00:00
Emma Garland
034b080c41 Don't rename, too many file changes 2021-02-26 14:52:54 +00:00
Emma Garland
bce27c1fe4 Reverted name change 2021-02-26 14:33:27 +00:00
Emma Garland
525d14ed25 Updated to set correct properties 2021-02-26 14:21:23 +00:00
Emma Garland
c36aaabd0e Updated to move the logic for whether the password change can occur, into the controller, 2021-02-26 12:42:18 +00:00
Emma Garland
8f392c252a Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 
# Conflicts:
#	src/Umbraco.Core/Models/ChangingPasswordModel.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
 2021-02-26 11:12:34 +00:00
Kenn Jacobsen
3769e8108c Remove static methods and events from EmailSender 2021-02-25 15:08:56 +01:00
Mole
0a2efc252f Re introduce cookie check, but adding return statement 2021-02-24 13:20:53 +01:00
Mole
2fcae1cc28 Fix installing packages. 2021-02-24 12:54:30 +01:00
Kenn Jacobsen
0393a54abf Postfixed notifications with "Notifications" for improved discoverability 2021-02-24 08:56:41 +01:00
Kenn Jacobsen
06c5ce5bb8 Replace static editor model events events with IEventAggregator notifications 2021-02-24 08:43:50 +01:00
Kenn Jacobsen
b1aabade55 Formatting and comments 2021-02-23 16:20:22 +01:00
Kenn Jacobsen
b05d71f76c Replaced static events in TreeControllerBase with IEventAggregator notifications 2021-02-23 16:09:36 +01:00
Bjarke Berg
ef4e2eb511 Renamed service implementations namespace to Core 2021-02-23 12:24:51 +01:00
Bjarke Berg
dc4595b16a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
 2021-02-23 12:07:22 +01:00
Bjarke Berg
d641e375c5 Merge pull request #9833 from umbraco/9622-remove-backofficeidentity 
Netcore: Remove UmbracoBackOfficeIdentity
 2021-02-23 11:29:23 +01:00