yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,644 Commits 4 Branches 7 Tags
13b77d35df31b027cf279a9ee29ca2f1e856d0f5
Commit Graph

259 Commits

Author SHA1 Message Date
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
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
Shannon
780b2e573b Fixes a startup issue that doesn't bubble the underlying boot failed exception if the container fails. 2020-09-25 00:27:46 +10:00
Nikolaj
120e163682 Begin trying to replace logger in Current 2020-09-16 13:46:45 +02:00
Nikolaj
a18580c7f6 Remove Debug<T> from LoggerExtensions 2020-09-16 10:24:05 +02:00
Nikolaj
488093add3 Remove LogWarning<T> from LoggerExtensions 2020-09-16 10:08:18 +02:00
Nikolaj
dda6fb12a3 Remove LogError<T> from LoggerExtensions 2020-09-16 09:40:49 +02:00
Nikolaj
02828db8fd Add work on PublishedSnapshotService 2020-09-15 08:45:40 +02:00
Nikolaj
a1ecc4a5c9 Change Warn to LogWarning 2020-09-14 10:17:32 +02:00
Nikolaj
d7e3bce741 Rename Error to align it with MS ILogger 2020-09-14 09:10:53 +02:00
Shannon
c8488b6683 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-20 16:08:07 +10:00
Shannon
639c7a40ee Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Examine/IndexRebuilder.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-20 16:03:10 +10:00
Shannon
b80dc8f34b readability 2020-07-08 15:07:12 +10:00
Shannon
7590161858 comments 2020-07-08 14:54:26 +10:00
Shannon
7819d1acf5 comments 2020-07-08 14:53:53 +10:00
Shannon
a947fa3121 comments 2020-07-08 14:51:35 +10:00
Shannon
651756d96a Ensure we don't shutdown MainDom if there is an error while listening, only shutdown if the appdomain is triggered to shutdown, else we'll keep listening/logging 2020-07-08 13:43:20 +10:00
Shannon
65101beaf6 transactions for sqlmaindom 2020-07-08 13:43:20 +10:00
Shannon
6aa49242f2 Don't try to reuse db instances, thsi can result in potential zombie transactions 2020-07-08 13:43:20 +10:00
Sebastiaan Janssen
a88a5a0cae Merge pull request #7984 from umbraco/v8/bugfix/7967-sqlmaindom 
Fixes #7967 - cannot start site with SqlMainDomLock  when db isn't configured

(cherry picked from commit cbfe643a79)
 2020-07-02 10:38:10 +02:00
Shannon
af29b8da68 Cherry pick #8058 to fix #8038 2020-05-04 20:59:22 +10:00
Shannon
2dd938bf29 Change to re-use the MainDomId of the normal maindom 2020-05-04 19:12:20 +10:00
Shannon
0717d5b246 Fixes: SqlMainDom setting for Azure does not work in Load Balancing #8038 2020-05-04 18:57:55 +10:00
Shannon
008df6018c Fixes: SqlMainDomLock when configured via appSettings cannot be used unless umbraco is installed #7967 2020-04-21 00:02:59 +10:00
Shannon
f24cae51d8 Renames IHostingEnvironmentLifetime to IApplicationShutdownRegistry 2020-03-26 15:39:20 +11:00
Shannon
612a47b16b Splits interfaces into separate ones, removes overlap between interfaces, injects the necessary bits, and much more 2020-03-25 15:06:22 +11:00
Jeavon
5efeb53805 Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700) 2020-02-24 11:11:33 +00:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Shannon
52b93bfc9c ensures only _sqlServerSyntax is used 2020-01-23 18:33:55 +11:00
Shannon
8d7ed7dd32 adds const fixing naming 2020-01-23 16:26:13 +11:00
Shannon
201927580c Fixing accidental api signature breaking change 2020-01-23 16:23:27 +11:00
Bjarke Berg
1dfdfba236 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2020-01-22 09:39:06 +01:00
Shannon
b02360518d Changed to GetAwaiter/GetResult and updates comment 2020-01-13 22:25:46 +11:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01:00
Bjarke Berg
d2443ea4c0 AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff. 2020-01-07 13:08:21 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Shannon
95337d5a70 Cleans up old notes 2020-01-06 21:39:26 +11:00
Shannon
7a129f890d Changes MainDom testing timeout to be larger... but not 1.5 mins! 2020-01-03 15:07:21 +11:00
Shannon
a46e9124d2 First commit in fixing deadlock - committing my notes, etc... 2020-01-03 10:38:48 +11:00
Shannon
b24a87d986 Changes logging to debug 2019-12-30 18:51:38 +11:00
Shannon
5476388e78 adds lock else we end up detecting when not needed 2019-12-30 18:49:33 +11:00
Shannon
0d1101eaa7 adds notes/logging 2019-12-30 18:14:18 +11:00
Shannon
7501629c54 Adds logging to SqlMainDomLock 2019-12-30 17:15:57 +11:00
Shannon
74cc148b99 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2019-12-23 18:21:03 +11:00
Bjarke Berg
6c923bc9b4 AB4227 - Moved a mix of files 2019-12-18 13:42:33 +01:00
Bjarke Berg
897cb63ad6 AB4227 - Moved Packaging, Compose, Dictionary, Manifest and Sync 2019-12-18 13:42:31 +01:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Shannon
0d0f8e6beb adds debug timing 2019-12-18 11:08:15 +11:00
Shannon Deminick
62c701d5c3 Merge pull request #6630 from ronaldbarendse/v8/bugfix/6624-enable-disablecomposer-from-all-assemblies 
Get EnableComposer and DisableComposer attributes from all assemblies
 2019-12-17 06:56:34 +01:00
Ronald Barendse
507db27337 Removed unnecessary WithCollectionBuilder call 2019-12-12 14:38:16 +01:00