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

21 Commits

Author SHA1 Message Date
Nicholas-Westby
4a2544d0e6 Replaced "retreive" with "retrieve". 2014-03-25 20:32:39 -07:00
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
4df79ce55b re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc. 2013-09-30 13:47:19 +10:00
Shannon
15d2021786 Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose. 2013-09-30 13:36:49 +10:00
Shannon
e02dddc747 obsoleting legacy prop eds 2013-09-25 19:03:05 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
c3619d9ac5 Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected. 2013-08-14 13:38:28 +10:00
Shannon
6f9883d373 Fixes MNTP required validation (U4-1975) 2013-07-22 12:30:12 +10:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly. 
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
 2013-06-01 20:40:51 -02:00
leekelleher
b6ec364156 Updated references to the new constants for Application and MediaType aliases. 2013-03-22 13:13:05 +00:00
Shannon Deminick
66bf667100 Merge with 4.11.4 2013-01-29 09:58:47 +06:00
leekelleher
9f5f920c81 MNTP: Corrected a typo in the example XPath (additional apostrophe) 2013-01-28 17:18:20 +00:00
Morten Christensen
81adf3f746 Fxies U4-1466 2013-01-14 15:27:22 -01:00
leekelleher
6589d5d5d3 MNTP: Fixed an long-time CSS bug. Aligned the header with the right-panel. 2012-12-21 15:58:02 +00:00
Shannon Deminick
ce4828d678 Fixes HasContent if there is actually no content (new install). 
Fixes issue with TreeDefinitionCollection not initializing when accessing singleton... not sure how i overlooked that before. This fixes
issues with MNTP initialization and probably some other tree stuff.
Removes warning log in umbracomodule for not a document as this just takes up space in the log.
Fixes issue with logger that was logging 'Info' for our internal Debug calls.
 2012-10-11 02:30:48 +05:00
Ove@EyeCatch-MPC
48e8e12877 Reverted some changes to AbstractDataEditorControl in 7260 to retain backwards compatibility. 2012-08-27 14:59:39 -02:00
sebastiaan
2b248e621c Merge in Azzlack/AbstractDataEditorFix 2012-08-27 11:14:06 -02:00
leekelleher
19f7ba1ef4 MNTP: Applied CSS fix to the header style. Bug raised on uComponents. 
http://ucomponents.codeplex.com/workitem/14746
 2012-08-23 14:19:00 -01:00
azzlack
b226be4939 Split AbstractDataEditorControl to separate class file. 
Cleaned up code in AbstractDataEditor and AbstractDataEditorControl.
Made AbstractDataEditorControl inherit from INamingContainer to help with control id issues.
Made the ID and DataTypeName fields of AbstractDataEditor abstract so they must be implemented.
 2012-07-27 21:34:58 -02:00
shannon@ShandemVaio.home
580cb340ac Cleaning up folder structure (U4-56) 2012-06-22 20:39:48 +04:00