Shannon 371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias ...

Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs

2013-09-17 00:27:17 +10:00

..

App_Browsers

…

App_Plugins

Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID.

2013-09-11 18:25:51 +10:00

config

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

install

Simplifies more of the interface config collection to reduce nesting.

2013-09-16 16:16:42 +10:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

umbraco

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

Umbraco

Updating legacy edtors in developer section

2013-09-11 14:04:26 +02:00

umbraco_client

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

Views

Fixing nuget related issue #U4-2067 and updating version

2013-04-22 06:01:31 -02:00

xslt

added web.config files to the root of xslt folders which will disable the ability for people

2013-05-12 19:29:05 -10:00

default.aspx

…

Global.asax

…

packages.config

Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust.

2013-08-13 15:41:40 +10:00

Umbraco.Web.UI.csproj

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

web.Template.config

Simplifies more of the interface config collection to reduce nesting.

2013-09-16 16:16:42 +10:00

web.Template.Debug.config

Simplifies more of the interface config collection to reduce nesting.

2013-09-16 16:16:42 +10:00

web.Template.Release.config

Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config

2013-06-21 16:20:18 +10:00