Commit Graph

36684 Commits

Author SHA1 Message Date
Andy Butland
3acea01501 Restored functionality and fixed tests for BackOfficeHandler. 2020-12-03 12:22:31 +01:00
Bjarke Berg
2f537c6ec8 Fix mocking 2020-12-03 11:57:03 +01:00
Bjarke Berg
8e3a01cdfc Merge remote-tracking branch 'origin/netcore/netcore' into feature/auth-policies-tests 2020-12-03 11:30:35 +01:00
Bjarke Berg
d711bce5ef build fix 2020-12-03 11:29:17 +01:00
Andy Butland
324b983c57 Added tests for ContentPermissionsPublishBranchHandler. 2020-12-03 11:10:16 +01:00
Andy Butland
76dafcc413 Added tests for MediaPermissionsQueryStringHandler.
Introduced base class to share code between content and media query string related permissions handlers.
2020-12-03 10:01:46 +01:00
Shannon
8b57e3080e Fixing fields vs props (oops) and some other stylecop violations 2020-12-03 19:36:38 +11:00
Andy Butland
6857a92460 Added tests for ContentPermissionsQueryStringHandler. 2020-12-03 09:31:20 +01:00
Shannon Deminick
0f872f5e4a Merge pull request #9338 from JimBobSquarePants/netcore/linting
Add Stylecop and .EditorConfig Linting.
2020-12-03 19:20:00 +11:00
Shannon Deminick
7a719954dd Merge pull request #9470 from umbraco/netcore/feature/2FAuth
Back office user updates to support OAuth and 8.9 features
2020-12-03 18:54:53 +11:00
Shannon
9e6baf7b7f reverts js changes to continue to support multiple destinations but with the fix of returning the task instance from within MoveViewsAndRegenerateJS 2020-12-03 18:52:28 +11:00
Andy Butland
45b9f31e44 Added tests for ContentPermissionsResourceHandler and MediaPermissionsResourceHandler. 2020-12-03 08:30:37 +01:00
Andy Butland
009ba1b81b Added tests for DenyLocalLoginHandler. 2020-12-02 21:32:22 +01:00
Andy Butland
e178cd08b7 Added tests for TreeHandler. 2020-12-02 19:51:27 +01:00
Andy Butland
2baf95e014 Added tests for SectionHandler. 2020-12-02 19:04:43 +01:00
Andy Butland
dc1cf85ab9 Added tests for UserGroupHandler. 2020-12-02 18:51:17 +01:00
Andy Butland
c707d2b346 Added tests for BackOfficeHandler. 2020-12-02 17:21:32 +01:00
James Jackson-South
4a544829a9 Merge branch 'netcore/netcore' into netcore/linting 2020-12-02 16:19:37 +00:00
Andy Butland
6c52048c55 Added tests for AdminUsersHandler. 2020-12-02 16:57:36 +01:00
Bjarke Berg
cbe8f816ca Merge pull request #9483 from umbraco/netcore/feature/yaml_nightly_builds
NetCore: Prepare pipeline for nightly builds
2020-12-02 13:19:42 +01:00
Bjarke Berg
97000590c3 Added "Update Version" step
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 12:21:25 +01:00
Bjarke Berg
142c0d8bb8 Merge pull request #9459 from umbraco/netcore/feature/azure-yaml-pipeline
NetCore: Set up CI with Azure Pipelines
2020-12-02 10:54:48 +01:00
Bjarke Berg
3250231e02 Increased timeout for integration tests
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 10:10:42 +01:00
Bjarke Berg
62771d7c08 added mac os x for unit tests
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 10:09:30 +01:00
Bjarke Berg
af03b98071 https://github.com/umbraco/Umbraco-CMS/pull/9459 Indentation
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 09:03:45 +01:00
Bjarke Berg
23ac4eb8fb https://github.com/umbraco/Umbraco-CMS/pull/9459 seperate unit tests and build artifacts into two jobs
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 08:56:24 +01:00
Bjarke Berg
9f5437a72e https://github.com/umbraco/Umbraco-CMS/pull/9459 seperate unit tests and build artifacts into two jobs
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 08:53:49 +01:00
Bjarke Berg
43278183e7 https://github.com/umbraco/Umbraco-CMS/pull/9459 run stages in parallel
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 08:38:50 +01:00
Bjarke Berg
a00c195f26 Fix more issues with MapPath
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 08:27:37 +01:00
Bjarke Berg
d23986101b Fix more issues with MapPath
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 08:21:17 +01:00
Bjarke Berg
05af0bd955 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/azure-yaml-pipeline 2020-12-02 07:57:28 +01:00
Bjarke Berg
59aa4219de Merge remote-tracking branch 'origin/netcore/feature/azure-yaml-pipeline' into netcore/feature/azure-yaml-pipeline 2020-12-02 07:56:01 +01:00
Bjarke Berg
3d82873028 Fix issue with MapPath
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-02 07:55:51 +01:00
Shannon
d0e17d16bc ext method for authn back office scheme with null check, fixing tests 2020-12-02 15:49:28 +11:00
Shannon
e297bc8c8d oops still have c# 9 stuff 2020-12-02 14:43:33 +11:00
Shannon
0846fc5690 Cleans up IBackofficeSecurity, ensures authn for the AuthenticationController/BackOfficeController 2020-12-02 14:28:16 +11:00
Shannon
372674abde re-adds test scheme for test authn/authz 2020-12-02 13:32:14 +11:00
Shannon
4f7c87d1d2 Fix build issues after merge 2020-12-02 13:19:08 +11:00
Shannon
0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
2020-12-02 13:14:47 +11:00
Shannon
37cf0d3d16 clean up TODOs 2020-12-02 13:04:02 +11:00
Shannon
999be04285 cleaning up TODOs 2020-12-02 12:22:08 +11:00
Bjarke Berg
98cf259f0c post merge - fix more issues in legacy csproj
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-01 20:20:47 +01:00
Elitsa Marinovska
8ea2787f08 using again 3.1.x format of .net core sdk verison 2020-12-01 15:30:06 +01:00
Elitsa Marinovska
8d7ec23f69 Reverting back the netcore sdk version 2020-12-01 15:15:34 +01:00
Elitsa Marinovska
55cd83bbac Update azure-pipelines.yml for Azure Pipelines
Copied over the yaml file as something is acting up
2020-12-01 15:03:29 +01:00
Elitsa Marinovska
236f54d1c6 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/azure-yaml-pipeline 2020-12-01 14:47:08 +01:00
Bjarke Berg
2e67275687 Post merge - Fix powershell build.ps1 2020-12-01 14:25:10 +01:00
James Jackson-South
62959811ac Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-12-01 12:47:08 +00:00
Bjarke Berg
a1df7c159a Post merge - Fix build 2020-12-01 11:39:24 +01:00
Bjarke Berg
85c01d9905 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
#	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/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
2020-12-01 11:34:13 +01:00