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

24312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren
8331abf4a2 Remove log4net from Tests & Benchmark projects 2018-07-31 15:42:20 +01:00
Warren
0c3601435e Removes mention of Log4Net & removes commented out methods 2018-07-31 15:31:43 +01:00
Warren
20d8139399 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-07-31 15:28:47 +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
a460d48607 Remove mention of Log4Net 2018-07-31 15:26:38 +01:00
Stephan
ee5a834ab0 Ensure build respects NUGET_PACKAGES 2018-07-31 15:55:31 +02: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
Stephan
f35c63fa40 Renormalize 2018-07-31 14:14:52 +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
309ca0a765 Fix tests after merge (loadPackager tree is gone) 2018-07-31 13:41:38 +02:00
Stephan
abc2bfa774 Cleanup merge of migrations 2018-07-31 13:35:12 +02:00
Stephan
3c446a3ba0 Cleanup merge of Color Picker editor 2018-07-31 13:35:12 +02:00
Stephan
f30171bcfd Cleanup filenames 2018-07-31 13:35:12 +02:00
Warren
216d01d323 Merge branch 'temp8' into temp8-serilog 2018-07-31 11:19:28 +01:00
Warren
80db20fdfb Fix up failing JS unit test from a recent change from V8 hackathon to the query builder syntax (was curly's on new lines) 2018-07-31 11:18:24 +01: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
ashallcross
02b6b77d38 Updated links in readme file (#2822) 
Updated the links from our.umbraco.org > our.umbraco.com also the case study and cloud links
 2018-07-31 10:39:51 +02:00
Shannon
6e36755de5 updates gitignore 2018-07-31 15:37:47 +10:00
Shannon
190b16626f updates gitignore 2018-07-31 15:26:09 +10:00
Shannon
ecc83595c8 minor merge fixes 2018-07-31 15:12:49 +10:00
Shannon
d073e727cb minor merge fixes 2018-07-31 15:11:31 +10:00
Shannon
b96e1343c2 renames lang files back to correct cased folder... now we'll see if merging detects renames 2018-07-31 15:00:56 +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
814e4c781f testing rename change 2018-07-31 14:44:23 +10:00
Shannon
5ef067b5f0 More manual merges 2018-07-31 13:05:54 +10:00
Shannon
c36a1e4537 Fixes issue with pre-value models due to data type refactor (has been already fixed in other temp branches) 2018-07-31 12:50:30 +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
Shannon
d3c45bc90f lang files merged 2018-07-31 11:26:27 +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
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
Sebastiaan Janssen
3a0c872587 Merge pull request #2631 from poornimanayar/U4-8617 
check for recursive value
 2018-07-30 17:30:47 +02:00
Steven Harland
92b11bf966 Increase z-index of .umb-nav-tabs (#2566) 
This lowers the chances of property editors overlapping the tab overflow menu.
More info here: http://issues.umbraco.org/issue/U4-11185
 2018-07-30 17:10:50 +02:00
Steven Harland
a7f68fa3d3 Add margin and padding to tabs dropdown (#2560) 
This reduces the space between the active tab and tab content so that they bleed into each other.
More info here: http://issues.umbraco.org/issue/U4-11181
 2018-07-30 17:03:53 +02:00
Sebastiaan Janssen
f59104a6f1 Merge pull request #2810 from AnthonyCogworks/refactor-obsolete-sweep4 
v8hackathon Refactor obsolete sweep4 [v8hackaton]
 2018-07-30 16:31:18 +02: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
9397b34e35 Merge pull request #2805 from AnthonyCogworks/refactor-obsolete-sweep2 
v8hackathon Refactor obsolete sweep2 [v8hackaton]
 2018-07-30 16:27:39 +02:00
Sebastiaan Janssen
2613d0b5ac Pass UrlProvider in from grid editor too 2018-07-30 16:18:59 +02:00
Sebastiaan Janssen
5a5ce293d2 Merge branch 'refactor-obsolete-sweep2' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-refactor-obsolete-sweep2 2018-07-30 16:12:45 +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
Sebastiaan Janssen
86acf0c1ad Revert "enable use of radiobuttonlist pre editor" 
This reverts commit 80412f56ee.
 2018-07-30 15:46:34 +02:00
Sebastiaan Janssen
2ea5a7a293 Make radiobuttonlist work with configs as well 
Re: https://github.com/umbraco/Umbraco-CMS/pull/2763#issuecomment-408848485
 2018-07-30 15:46:02 +02:00
Shannon
fbc4820ab4 Fixes migrations and updates the api usages for v8, more manual merging of files 2018-07-30 23:23:01 +10:00
Shannon
3a487e447b moves migrations 2018-07-30 22:25:29 +10:00
Stephan
ff607aef7a Remove obsolete stuff 2018-07-30 14:04:02 +02:00