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

11663 Commits

Author SHA1 Message Date
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
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
36cd06b952 Add Debug logging and dont set type for ex as we are not using it 2020-11-30 09:05:38 +00:00
Warren Buckley
8a6db7f71f Uncomment out the DEBUG lines 2020-11-30 09:05:03 +00:00
Warren Buckley
eeae4afe0b Merge remote-tracking branch 'origin/v8/dev' into v8/feature/property-label-on-top 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-11-27 15:34:53 +00:00
James Jackson-South
3965e71138 Fix private instance field naming rules in Rider 2020-11-27 13:52:47 +00:00
Warren Buckley
643407d994 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/anon-telemetry 2020-11-27 09:48:36 +00:00
James Jackson-South
2fae17f72b Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-11-27 00:00:12 +00:00
Bjarke Berg
f249553549 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
 2020-11-26 13:14:26 +01:00
Bjarke Berg
87b6c4852f Merge pull request #9448 from AndyButland/feature/membership-helper-facade-2 
NetCore: Migrated member related partial views
 2020-11-26 06:38:11 +01:00
Paul Johnson
7f8ed7b2e3 Resolve naming issues from #9415 
Note that I removed the comment around funky namespace without changing namespace, dead comment from 2016.
 2020-11-25 05:11:31 +00:00
James Jackson-South
4a1040d1af Naming rules now work 2020-11-24 12:20:43 +00:00
Paul Johnson
7e9a13a4ab Register instances instead of factory method with discard. 2020-11-24 12:20:05 +00:00
Paul Johnson
633c391f85 Merge branch 'netcore/netcore' into netcore/feature/msdi-remove-composition 2020-11-24 12:05:32 +00:00
Bjarke Berg
84237d4a57 Remove Security from UmbracoContext (#9392) 
* Remove Security from UmbracoContext

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Removing files reference from csproj

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-11-24 12:52:48 +01:00
Andy Butland
b331d683ec Migrated member related partial views along with necessary methods from MembershipHelper into IUmbracoWebsiteSecurity. 2020-11-24 11:33:46 +01:00
Paul Johnson
7abf9466c0 Merge branch 'netcore/netcore' into netcore/feature/msdi-remove-composition 2020-11-23 12:29:00 +00:00
Paul Johnson
a62079d794 Use OptionsMonitorAdapter over AspNetCoreHostingEnvironmentWithoutOptionsMonitor 
Rollback Serilog setup as I broke BASEDIR env var
 2020-11-23 10:27:13 +00:00
Kenn Jacobsen
b7d37f2279 Replace obsolete usages with injected services in UmbracoHelper 2020-11-23 10:47:15 +01:00
nzdev
32788a0a42 reduce array allocations 2020-11-23 10:36:46 +01:00
Sebastiaan Janssen
b5546d074a Merge branch 'v8/contrib' into v8/dev 2020-11-23 10:19:14 +01:00
Paul Johnson
5e2de50382 Fix legacy tests 2020-11-20 12:32:56 +00:00
Paul Johnson
8b97ce69b1 Removed CoreRuntimeBootstrapper 
Establish runtime level at run time not during service registration.
 2020-11-19 20:21:45 +00:00
Paul Johnson
3672a9f2f2 Add composers via extension on UmbracoBuilder 
reduce scope of CoreRuntimeBootstrapper
 2020-11-19 16:20:39 +00:00
Benjamin Carleski
42f4fdf8c8 Don't prepend root to path when path starts with root 2020-11-19 03:07:05 -08:00
Paul Johnson
aec25d5007 Replace Composition with UmbracoBuilder 2020-11-18 17:41:57 +00:00
Benjamin Carleski
4d4cb0d221 Fix unit test failures 2020-11-18 08:51:58 -08:00
Benjamin Carleski
2309bb9d5b Finish removing IOHelper.MapPath references 2020-11-18 08:10:16 -08:00
Andy Butland
0fbe01cd22 Created new abstraction IUmbracoWebsiteSecurity and migrated controller's using it (replacing MembershipHelper) to Umbraco.Web.Website. 2020-11-18 16:12:42 +01:00
Benjamin Carleski
d51677d5ed Split IOHelper into platform specific versions 2020-11-18 04:49:03 -08:00
Shannon
c2d9f5aa4e Ensure that TaskScheduler.Default is used anywhere that ContinueWith is used, adds more debug logging to MainDom operations 2020-11-18 12:33:13 +11:00
Laura Weatherhead
cc74be5a27 Fix mis-spelt "occurred" 2020-11-17 08:49:01 +10:00
Bjarke Berg
e46a248832 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
 2020-11-12 13:10:19 +01:00
Bjarke Berg
bb1b04be15 Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375) 
* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved SurfaceControllerTypeCollection + Builder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved Extension methods

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Removed Wrap methods.. People should use their own TagBuilder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-12 11:01:19 +01:00
Bjarke Berg
eaf6543f99 post merge 2020-11-12 09:50:55 +01:00
Bjarke Berg
b2bcdb898e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Services/IconService.cs
 2020-11-12 09:13:53 +01:00
Warren Buckley
59a03115ea Posting to service needed lowercase properties 2020-11-10 09:58:15 +00:00
Paul Johnson
3f5f85880e NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356) 
* Split Bootstrap code from CoreRuntime

* Make ContentService method signatures match interface
prevents need to hide the concrete class in tests

* Remove Current

Only bit that bugs me is TreeNode for IconFilePath
I get the feeling it's dead code, but can just use a setter in cs or work out path in js if required.

* Fix tests, remember to terminate IRuntime
 2020-11-10 09:50:47 +01:00
Warren Buckley
191d86e27c Do not log that marker file exists already during the serval install boot cycles 2020-11-10 08:25:32 +00:00
Callum Whyte
1654bea562 Casting tree controllers to TreeControllerBase to support manually registered trees without attributes 2020-11-09 19:45:16 +00:00
Claus
7701a0f745 Merge pull request #9361 from umbraco/v8/bug/logviewer-access 
Limit access to logviewer endpoints to people with access to the settings section
 2020-11-09 11:26:20 +01:00
Sebastiaan Janssen
bd4c2cde61 D'oh.. don't push commented out code as used for testing.. 2020-11-09 10:30:45 +01:00