Shannon
21c0152131
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/Umbraco.Tests/BusinessLogic/BaseTest.cs
src/Umbraco.Web.UI/install/steps/theend.ascx
src/Umbraco.Web.UI/umbraco/Default.aspx
src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
src/Umbraco.Web.UI/umbraco/umbraco.aspx
src/Umbraco.Web/UmbracoContext.cs
src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/library.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
src/umbraco.businesslogic/Utils/TypeFinder.cs
src/umbraco.cms/businesslogic/Packager/Installer.cs
src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
src/umbraco.cms/businesslogic/skinning/Skin.cs
src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
src/umbraco.controls/CodeArea.cs
src/umbraco.controls/ProgressBar.cs
src/umbraco.editorControls/macrocontainer/Editor.cs
2013-10-03 12:51:46 +10:00
Shannon
55247fe31d
Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)
2013-10-03 12:45:40 +10:00
Shannon
1e9a17babe
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Shannon
81b43545c1
Updated the remainder of the legacy UmbracoSettings calls to use the new format, now to just fix up the unit tests
2013-09-16 12:36:12 +10:00
Shannon
7538698e7b
updated most of the calls from the legacy UmbracoSettings to use the new way - nearly done.
2013-09-13 18:36:41 +10:00
Shannon Deminick
91ee948b4e
Obsolete's requestModule and Singleton
2013-02-19 00:50:38 +06:00
Sebastiaan Janssen
16289b8f2d
U4-7 - Finish logging refactor
2012-12-26 11:59:51 -01:00
Morten Christensen
0ae707fe78
Refactoring the umbraco version from GlobalSettings to be a seperate class that simply wraps the version from the assembly.
...
Since the version will come from the assembly there is no need to have it as part of the GlobalSetting, which is internal and needs a makeover of its own.
2012-11-26 11:18:06 -01:00
Morten Christensen
3fe1975514
Refactoring usages of umbraco.GlobalSettings.CurrentVersion to use the new Umbraco.Core.Configuration.GlobalSettings.Version
2012-11-26 09:57:05 -01:00
shannon@ShandemVaio
b13c16ddc2
Moved remaining classes/files into "umbraco.presentation" folder
2012-07-19 21:49:42 +06:00
