yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,892 Commits 4 Branches 7 Tags
544753112ea0a12b9fd34ab2bbf9b8baa37f4c4d
Commit Graph

36892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Jackson-South
0369375d8e Merge branch 'netcore/netcore' into netcore/feature/9397 2020-12-01 12:44:10 +00:00
James Jackson-South
748cbb1f7b Normalize builder namespace 2020-12-01 12:42:14 +00:00
James Jackson-South
ea79051104 Register as singleton, test DI into handlers. 2020-12-01 12:09:50 +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
Elitsa Marinovska
0a6b96e8f5 Publishing artifacts 2020-12-01 11:06:17 +01:00
Bjarke Berg
739194d71f Post merge - Fix for acceptance tests 2020-12-01 11:02:11 +01:00
Elitsa Marinovska
23173b966b Test with .net core sdk version 5.0.x didn't work so reverting back to 3.1.x 2020-12-01 09:31:16 +01:00
Elitsa Marinovska
fe2d407fcb Update the sdk version format 2020-12-01 09:16:09 +01:00
Bjarke Berg
27b44c6594 Post merge - Fix for tests 2020-12-01 09:14:46 +01:00
Elitsa Marinovska
5c70ed1e74 Updated .Net Core sdk version 2020-12-01 08:39:05 +01:00
Bjarke Berg
3e0d52b330 Merge pull request #9428 from umbraco/netcore/task/6666-auth-policies 
Migrate authorization filters to authorization policies
 2020-12-01 08:17:04 +01:00
Shannon
fe5dcd83bb removes the 2FA store implementation since that will need to be manually enabled 2020-12-01 18:14:37 +11:00
Shannon
4671d9d23b moves the back office user auditing logic 2020-12-01 17:51:52 +11:00
Shannon
20b4f55664 Fixes up a bunch of TODOs moves user manager to the back office project so we have acess to necessary services, splits apart files, removes old code, starts implementing the 2fa stuff 2020-12-01 17:24:23 +11:00
Shannon
a995cdc360 Fixes TryConvertTo with StringValues 2020-12-01 16:08:16 +11:00
Shannon
e431c82edc fix returning null issue 2020-12-01 15:20:34 +11:00
Shannon
927335149d try fixing watch task 2020-12-01 15:02:28 +11:00
James Jackson-South
a3cc3769c0 Mocking should be an act of desperation! 2020-12-01 01:13:08 +00:00
James Jackson-South
e41122eb8c Add EventAggregator 2020-11-30 23:39:56 +00:00
James Jackson-South
601270640c Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-11-30 21:19:32 +00:00
James Jackson-South
2261ca8e45 Update to be editable via the UI 2020-11-30 21:19:02 +00:00
Warren Buckley
7ff0f9ee20 Bump version to 8.10.0-rc 
.\build SetUmbracoVersion 8.10.0-rc
 2020-11-30 13:27:33 +00:00
Warren Buckley
6b744b39cc Merge pull request #9370 from umbraco/v8/feature/anon-telemetry 
Anonymous telemetry
 2020-11-30 13:23:12 +00:00
Shannon
47b4a4d234 FIxes authz on some controllers, fixes js var paths for login providers, simplifies gulp so we aren't building 2x. 2020-12-01 00:19:08 +11:00
Bjarke Berg
6d120322e5 Do not dispose the static httpClient, but the HttpRequestMessage 2020-11-30 13:35:55 +01:00
Warren Buckley
ee89610559 Remove unused RuntimeState 2020-11-30 12:23:28 +00:00
Warren Buckley
04430976c1 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/anon-telemetry 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-11-30 12:20:52 +00:00
Warren Buckley
39d66bae47 Merge pull request #8849 from umbraco/v8/feature/property-label-on-top 
Feature: Property label on top
 2020-11-30 11:55:55 +00:00
Shannon
efff96f711 Creates IBackOfficeSignInManager interface 2020-11-30 22:46:05 +11:00
Warren Buckley
23a31f56e7 Merge pull request #9469 from umbraco/v8/bugfix/9466-dont-use-form-horizontal-on-membergroups 
Review Remove this form-horizontal class from member groups info
 2020-11-30 11:26:50 +00:00
Shannon
6176046053 Deals with the Xsrf notes and handling in sign in manager 2020-11-30 22:23:10 +11:00
Bjarke Berg
13374a8654 post merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-30 11:57:00 +01:00
Warren Buckley
fa931416a4 Forgot to move the baseaddress set inside the usings 2020-11-30 10:34:10 +00:00
Warren Buckley
4de3c05e83 Wrap use of httpClient in a usings due to it being IDisposable 2020-11-30 10:33:07 +00:00
Bjarke Berg
1aea3f9085 Merge pull request #9414 from umbraco/netcore/feature/linux-paths 
Linux paths
 2020-11-30 11:30:53 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
 2020-11-30 11:24:24 +01:00
Warren Buckley
3e6830e173 Exit out of function but set to repeat if we are unable to read the file (perhaps a file lock) 2020-11-30 10:18:11 +00:00
Warren Buckley
fc2ff2525d No need for the if null check as it will always be null in the ctor 2020-11-30 10:15:06 +00:00
Warren Buckley
5328268645 Uncomment #ifdef 2020-11-30 10:08:48 +00:00
Warren Buckley
b29ed4c9c3 Set a low 1 second timeout, no need to be a BIG timeout on this request 2020-11-30 10:04:21 +00:00
Warren Buckley
1394387d43 Move the backgroundtask runner into Initialize method to follow same practise as SchedulerComponent 2020-11-30 09:18:13 +00:00
Warren Buckley
f747e2a2dc Missing namespace from Bjarkes suggestion to move to DataMember 2020-11-30 09:17:39 +00:00
Warren Buckley
5dcb488d2c Update src/Umbraco.Web/Telemetry/ReportSiteTask.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-30 09:12:27 +00:00
Warren Buckley
c5afcf1c9c Move marker file into App_Data a folder that can never be served 2020-11-30 09:08:24 +00:00