Shannon 5487ec1d5f Merge branch 'dev-v7-oembed' of https://github.com/tcmorris/Umbraco-CMS into tcmorris-dev-v7-oembed ...

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj

2015-06-25 16:57:52 +02:00

..

App_Browsers

…

config

Merge branch 'dev-v7-oembed' of https://github.com/tcmorris/Umbraco-CMS into tcmorris-dev-v7-oembed

2015-06-25 16:57:52 +02:00

Properties

Updates to latest AutoMapper and HtmlAgility

2015-06-16 10:19:34 +02:00

umbraco

updates how scripts render in main view - make it more clear where the callback is

2015-06-16 10:59:47 +02:00

Umbraco

Gets the IsConfigured check checking the migration data, updates the install controller to ensure there's no infinite redirects and to use the IsUpgrading flag. Now to add entries to the table when the migrations have executed.

2015-06-22 16:22:47 +02:00

umbraco_client

Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror

2015-06-24 19:06:42 +02:00

Views

Changed the surrounding quotes for Grid custom settings/styles to be double quotes

2015-02-27 10:06:45 -08:00

xslt

…

default.aspx

…

Global.asax

WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility.

2014-12-11 15:58:54 +11:00

packages.config

Updates to latest AutoMapper and HtmlAgility

2015-06-16 10:19:34 +02:00

Umbraco.Web.UI.csproj

Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror

2015-06-24 19:06:42 +02:00

web.Template.config

Bring web.config in line with the nuget one

2015-06-09 14:35:30 +02:00

web.Template.Debug.config

Fixes assembly references and assembly redirects

2015-06-06 22:35:24 +02:00

web.Template.Release.config

Made the whitespace consistent in config files.

2014-03-28 16:25:01 +00:00