yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,249 Commits 4 Branches 7 Tags
b42cbbc0ff9cfbb879bdf83bf76cd13ff6a61de9
Commit Graph

7005 Commits

Author SHA1 Message Date
Warren
c53d6f1948 Change Logger ctor to take in a Serilog LoggerConfiguration to make it easy to override in code if needed 2018-08-14 11:00:18 +01:00
Warren
31dcded8d6 Moves parts of the Serilog LoggerConfiguration to extensions methods for easier to read & re-use (if someone is attempting to configure the Serilog pipeline in code) 2018-08-14 09:37:29 +01:00
Warren
529a5e10d9 Use string.PadRight to be more explicit with what we are doing with the Log4Net level property enricher 2018-08-13 11:26:50 +01:00
Shannon
9d5d516064 Fixes up invariant property validation since we were only allowing one callback per alias, but we need to allow multiple 2018-08-13 11:25:55 +10:00
Warren
054308b44e Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog 2018-08-10 15:37:50 +01:00
Warren
212e0a091a Allows Serilog to be configured in a serilog.user.config file that will not effect the main umbraco logger 
Adds in support for filtering expressions - so the user logger configuration can filter by including or excluding on an expression - common use case to include only my namespace from SourceContext thjat starts with xyz
 2018-08-09 22:08:40 +01:00
Warren
9446c2a568 Trying with a nested logger config to see if it works better 2018-08-09 19:51:22 +01:00
leekelleher
92273f263b U4-11556 V8 - Removed metablogConfig.config 
http://issues.umbraco.org/issue/U4-11556

For v7, I've marked the `SystemFiles.MetablogConfig` strings as deprecated.
 2018-08-08 10:23:14 +01:00
Pavel Budik
3efbb47aed U4-11527 Fix concurrency issue 2018-08-08 10:38:53 +02:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Shannon
9e6947f62c Fixes issue of moving/deleting media along with other issues of us returning plain text responses with incorrect mime type results and an issue with our interceptors 2018-08-08 11:49:05 +10:00
Shannon
e53fe669ef Start to setting files with a culture and catering for being able to set any metadata for files 2018-08-07 00:43:52 +10:00
Shannon
9e1b4e1c52 cleanup 2018-08-06 21:39:30 +10:00
Shannon
7aaf024397 more work on validation, saving and publishing 2018-08-06 16:50:40 +10:00
James Coxhead
9a774c8f9e Added inactive state for users who haven't logged in 2018-08-02 22:01:45 +01:00
Shannon
be1fbcfe04 don't short circuit the property validation, run all of them for content for all variants so we get the correct response 2018-08-02 23:55:47 +10:00
Shannon
1f25847cd7 Gets contextual culture server validation working 2018-08-02 20:00:35 +10:00
Warren
2ec18d0489 Bit of a hack - adds extra whitespace behind Log4Net Levels in our enricher so that they are all 5 characters in length and logfile aligns nicely as it used to in old Log4Net setup 2018-08-01 10:44:20 +01:00
Warren
c59912ce94 Adds in SourceContext property into text log file that was missing - aka C# class/namespace 2018-08-01 10:43:14 +01:00
Warren
b89e7bca97 Adds our Serilog Enricher so that we can map Serilog log levels to Log4Net levels and use it the text log file so that the logfiles still look the same as previously 2018-08-01 10:33:38 +01:00
Warren
bfae07b95b Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-08-01 08:45:12 +01:00
Shannon
fc3c8bab45 Merge branch 'temp8' into temp-editing-all-variants 2018-08-01 15:16:02 +10:00
Shannon
35af025ae3 fixes migrations for v8 2018-08-01 12:37:44 +10:00
Shannon
dfc8f3837a Merge branch 'temp8' into temp-editing-all-variants 2018-08-01 12:36:45 +10:00
Shannon
19851b6986 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/PluginManager.cs
#	src/Umbraco.Core/Services/Implement/UserService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
#	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
#	src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
#	src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
#	src/Umbraco.Web/Install/FilePermissionHelper.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/requestModule.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.cms/businesslogic/Content.cs
#	src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
 2018-08-01 12:26:26 +10:00
Shannon
55e1a792da Fixes migrations for 7.12.0 2018-08-01 12:15:18 +10:00
Shannon
5eedfc2a53 Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
 2018-08-01 11:56:46 +10:00
Warren
1a69297c7e Changes in tests proj to not use Log4Net but Serilog 
However not sure how this is used to where the output of the logs was viewed when it was set/configured to console - VS Output Window, VSTS Logs?
 2018-07-31 22:03:41 +01:00
Warren
eda6c62fcc Minor change so that the text log filenames match better to old log4net style - adds in an extra . between Machine Name and the Date that gets added 2018-07-31 18:08:58 +01:00
Warren
5f226e7874 Adds in MachineName into the logfiles like we did previously 2018-07-31 16:15:07 +01:00
Warren
0c3601435e Removes mention of Log4Net & removes commented out methods 2018-07-31 15:31:43 +01:00
Warren
4392055249 Removes mention of Log4Net & the commented code with it as it's never invoked 2018-07-31 15:27:27 +01:00
Warren
998a7ff406 Merge branch 'temp8' into temp8-serilog 2018-07-31 14:51:50 +01:00
Stephan
a3f2372b6c Post-merge namespace cleanup 2018-07-31 14:56:40 +02:00
Stephan
c209bdde5b Fix routing, AliasUrlProvider 2018-07-31 14:48:30 +02:00
Warren
81095fb77d Adds an env variable (set to process level) so that the external config can use it to save files with a relative path 2018-07-31 12:43:26 +01:00
Stephan
abc2bfa774 Cleanup merge of migrations 2018-07-31 13:35:12 +02:00
Warren
e886086aed Adds in a new File sink - that will generate a JSON log file in the CLEF format so that it can be imported into a local copy of SEQ to help with filtering/finding log items 2018-07-31 10:21:26 +01:00
Warren
045ece0f70 After latest V8 merge - update the CSProj to remove the files that I nuked earlier 2018-07-31 10:19:04 +01:00
Warren
b5f728541a Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-07-31 09:51:44 +01:00
Warren
5cacdeafa8 Adds in Serilog.Settings.AppSettings package 
Configured to read from a custom .config file location as opposed to root web.config appsettings
Enable Serilog Debugging aka Selflog
 2018-07-31 09:50:43 +01:00
Mundairson
9cd2db5018 U4-11546 [v7] Clean up to remove compiler warnings (#2823) 2018-07-31 10:41:15 +02:00
Shannon
9241e1fcda WIP Getting the content controller a bit further, now need to pull apart the content binder 2018-07-31 17:50:24 +10:00
Shannon
122c18e6d7 Merge branch 'temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-07-31 15:56:04 +10:00
Shannon
d073e727cb minor merge fixes 2018-07-31 15:11:31 +10:00
Shannon
d272dbf611 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
#	src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
#	src/Umbraco.Core/Packaging/Models/PackageAction.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
#	src/Umbraco.Tests/Dependencies/NuGet.cs
#	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
#	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
#	src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
#	src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
#	src/Umbraco.Tests/Services/PerformanceTests.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI/Properties/Settings.Designer.cs
#	src/Umbraco.Web.UI/Properties/Settings.settings
#	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web.UI/config/feedProxy.Release.config
#	src/Umbraco.Web.UI/config/feedProxy.config
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
#	src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Properties/Settings.settings
#	src/Umbraco.Web/Properties/Settings1.Designer.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/LegacyDialogHandler.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
#	src/Umbraco.Web/app.config
#	src/Umbraco.Web/umbraco.presentation/item.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
#	src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
#	src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
#	src/umbraco.businesslogic/ApplicationTree.cs
#	src/umbraco.businesslogic/BasePages/BasePage.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.editorControls/uploadfield/uploadField.cs
 2018-07-31 14:57:20 +10:00
Shannon
5ef067b5f0 More manual merges 2018-07-31 13:05:54 +10:00
Shannon
f4342ed9cb Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI/web.Template.Debug.config
 2018-07-31 12:34:03 +10:00
Shannon
8517a8e088 fixes tests 2018-07-31 12:19:12 +10:00
Warren
cd2a70a520 Get logger to output as same file as old Log4Net and in same format (only diff currently is the log level type in the log file) 
Ensures we use the calling type in the Umbraco ILogger and passes it onto Serilog
 2018-07-30 16:36:38 +01:00