Sebastiaan Janssen 76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui ...

Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj

2013-08-25 15:50:07 +02:00

..

App_Browsers

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

config

removed my test examine settings

2013-08-13 18:26:32 +10:00

install

Fix merge issue

2013-07-19 13:32:24 +02: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 branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui

2013-08-25 15:50:07 +02:00

Umbraco/Images/pinnedIcons

Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

2013-07-15 16:31:19 +02:00

umbraco_client

Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui

2013-08-25 15:50:07 +02: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

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

Global.asax

Moves app initialization into new UmbracoApplication (global.asax)

2012-07-20 22:02:28 +06:00

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 branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui

2013-08-25 15:50:07 +02:00

web.Template.config

U4-2550 Could not load file or assembly 'HtmlAgilityPack, Version=1.4.5.0

2013-07-26 15:16:55 +02:00

web.Template.Debug.config

U4-2550 Could not load file or assembly 'HtmlAgilityPack, Version=1.4.5.0

2013-07-26 15:16:55 +02:00

web.Template.Release.config

Keep umbracoDbDSN in the appSettings in the released version to prevent people

2013-01-10 12:05:03 -01:00