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

3471 Commits

Author SHA1 Message Date
Stephan
bbd8315176 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 2018-09-06 13:57:34 +02:00
Stephan
612c38654d Merge branch origin/dev-v7 into temp8 2018-09-06 13:07:09 +02:00
Stephan
e8e2a21e9f Handle binding redirects 2018-09-04 19:44:24 +02:00
Stephan
34fb19ac76 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 2018-09-03 17:24:58 +02:00
Stephan
4a32eebb0b Cleanup logging 2018-08-30 19:08:55 +02:00
Stephan
8b4e2c5bcb Fix tests, a culture is not edited if not available 2018-08-30 13:06:41 +02:00
Stephan
7ab393f2b2 Fix TestHelper for properties comparisons 2018-08-30 12:51:55 +02:00
Stephan
52c6377366 Fix failing test due to 66a00546d 2018-08-30 12:08:01 +02:00
Stephan
069c42ef36 Ensure all ILogger impl support message templates 2018-08-30 10:48:27 +02:00
Shannon
029eff1f8a Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core. 2018-08-29 01:15:46 +10:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Shannon
8d6e297c37 Adds additional Fatal methods to match Error and move Fatal code above error so all logger code goes from Fatal -> Verbose 2018-08-28 15:24:45 +10:00
Shannon
06d08e2cb1 removes last log4net strings i can find 2018-08-27 16:49:54 +10:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Warren
24f91f1917 Adds in Error without ex for just a message and a message template with params 2018-08-23 14:43:38 +01:00
Warren
224a7de61f Update ignore list for typefinder tests to include Serilog. in exclusion filters 2018-08-23 12:56:35 +01:00
Warren
66e4e1f0f4 Adds new method to ILogger for taking only the exception - NOTE will add an empty string for the message 2018-08-23 12:14:07 +01:00
Warren
9e996c68bb Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too 2018-08-17 15:41:58 +01:00
Warren
a020d60f3e Adds in new log level from Serilog to our Umbraco ILogger - Fatal (Worse than Error) 2018-08-17 11:26:22 +01:00
Shannon
54af649b78 Cleans up some models, adds another unit test, fixes the Info tab state updating when a content item is changed. 2018-08-16 23:30:33 +10:00
Warren
b0d697af6c Forgot the ConsoleLogger needs to have Verbose added 2018-08-15 16:47:15 +01:00
Shannon
9e131aa633 oooooh our first ContentController test :) 2018-08-15 17:44:06 +10:00
Warren
f62f3300c2 Implements updates from recent ILogger changes for these other classes that use it 2018-08-14 13:29:38 +01:00
Warren
054308b44e Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog 2018-08-10 15:37:50 +01:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02: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
Warren
f0fb66be7d Fix unit test - One less Action class as Aduit has been removed from the context menu as its now part of the info tab on a content node 2018-08-07 08:58:36 +01:00
Shannon
3af09bfe9f fixes tests 2018-08-06 22:04:55 +10:00
Warren
dd63ff850c Remove test paths to umbraco_client - makes no sense to test for this path as it no longer exists 2018-08-06 11:54:07 +01:00
Warren
37444a500d ScrollingMenu - now that is vintage V3 & V4 UI days ! 2018-08-01 13:53:24 +01:00
Warren
bfae07b95b Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-08-01 08:45:12 +01:00
Shannon
6a94694f16 Got models pulled apart and simplified, much less inheritance and easier to follow, start wiring up the model binding logic for content along with validation for each variant 2018-08-01 16:46:13 +10:00
Shannon
c073ab2731 WIP still pulling apart models, binders, validators 2018-08-01 15:40:54 +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
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
aed9f77f31 Remove log4net from the typefinder tests 2018-07-31 15:44:59 +01:00
Warren
8331abf4a2 Remove log4net from Tests & Benchmark projects 2018-07-31 15:42:20 +01:00
Warren
998a7ff406 Merge branch 'temp8' into temp8-serilog 2018-07-31 14:51:50 +01:00
Stephan
309ca0a765 Fix tests after merge (loadPackager tree is gone) 2018-07-31 13:41:38 +02:00
Warren
b5f728541a Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-07-31 09:51:44 +01:00
Mundairson
9cd2db5018 U4-11546 [v7] Clean up to remove compiler warnings (#2823) 2018-07-31 10:41:15 +02: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
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
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
bee2c2dd16 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.Debug.config
 2018-07-30 16:42:15 +01:00
Sebastiaan Janssen
3c2e84fdae Merge pull request #2807 from AnthonyCogworks/refactor-obsolete-sweep3 
v8hackathon Refactored out some obsolete methods and files. [v8hackaton]
 2018-07-30 16:29:32 +02:00
Sebastiaan Janssen
4a1113307e Merge pull request #2802 from AnthonyCogworks/refactor-obsolete-mark2 
v8hackathon Refactor obsolete mark2 [v8hackaton]
 2018-07-30 16:10:52 +02:00