Shannon 82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 ...

Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs

2016-04-13 14:44:22 +02:00

..

App_Browsers

added Umbraco.Web.UI containing only web rendering files

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

App_Plugins/ModelsBuilder

Upgrade ModelsBuilder to 3.0.1

2016-03-14 13:37:49 +01:00

config

Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5

2016-04-13 14:44:22 +02:00

Properties

Updates to latest AutoMapper and HtmlAgility

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

umbraco

Ensures that the emails sent our are in the culture of the user, fixes issue of logging in after resetting password and then logging out again

2016-04-13 14:35:40 +02:00

Umbraco

Grid translations:

2016-02-16 08:50:07 +01:00

umbraco_client

Merge branch 'view-save-restore-cursor' of https://github.com/pynej/Umbraco-CMS into pynej-view-save-restore-cursor

2016-03-17 11:26:09 +01:00

Views

Adds required namespace + a fake class to make sure the namespace exists

2016-01-15 17:05:09 +01:00

default.aspx

added Umbraco.Web.UI containing only web rendering files

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

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

Upgrade ModelsBuilder to 3.0.2

2016-03-18 16:13:19 +01:00

Umbraco.Web.UI.csproj

Revert "Removes old obsoleted ping.aspx"

2016-04-04 09:20:59 +02:00

Umbraco.Web.UI.csproj.DotSettings

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00

web.Template.config

Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222

2016-04-12 18:07:25 +02:00

web.Template.Debug.config

Make sure that everybody working on the source actually gets these assembly references in web.config

2016-02-11 17:11:02 +01:00

web.Template.Release.config

Another build warning that can be removed

2016-02-04 18:36:26 +01:00