Shannon 85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor ...

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj

2015-08-04 17:10:58 +02:00

..

Lang

Fixes: U4-5777 Allow Localization of Plugins without having to edit core language files

2015-06-15 17:13:34 +02:00

splashes

Updates installer backgrounnd and nonodes page

2014-12-03 16:51:16 +01:00

404handlers.config

U4-2549 - fix it differently

2013-08-29 17:08:16 +02:00

404handlers.Release.config

U4-2549 - fix it differently

2013-08-29 17:08:16 +02:00

applications.config

Adds forms to the default app.config

2014-10-25 01:10:08 +02:00

applications.Release.config

WIP on background package installs

2014-08-18 20:42:56 +02:00

BaseRestExtensions.config

Removes uGoLive from the core (for now until it is rebuilt against v7 )

2013-11-28 10:51:54 +11:00

BaseRestExtensions.Release.config

fix config files for BaseRestExtension.config

2012-10-06 07:20:12 -02:00

ClientDependency.config

Bugfix content xml doctype issue

2015-07-13 14:08:50 +02:00

ClientDependency.Release.config

Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers

2013-11-28 14:27:58 +11:00

Dashboard.config

Fixes: U4-5834 Change password description text is confusing

2015-01-29 17:49:58 +11:00

Dashboard.Release.config

Fixes: U4-6673 Xml data integrity dashboard

2015-06-05 17:27:18 +02:00

EmbeddedMedia.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

EmbeddedMedia.Release.config

puts the Flickr provider back for backwards compat, adds a todo and updates the release config with all providers

2015-06-25 17:10:45 +02:00

ExamineIndex.config

Fixes: U4-6831 Add {machinename} to ExamineIndex.config by default

2015-07-16 17:19:49 +02:00

ExamineIndex.Release.config

Fixes: U4-6831 Add {machinename} to ExamineIndex.config by default

2015-07-16 17:19:49 +02:00

ExamineSettings.config

reverts UseTempStorage sync from examine settings on dev branch.

2015-01-02 11:55:18 +11:00

ExamineSettings.Release.config

Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard'

2014-04-01 11:53:56 +02:00

feedProxy.config

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-25 02:24:45 +11:00

feedProxy.Release.config

Wires up the help dialog with our and tv feeds

2013-10-29 21:49:40 +01:00

FileSystemProviders.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

FileSystemProviders.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

grid.editors.config.js

Cookie monster

2015-07-27 15:52:10 +02:00

log4net.config

Updates the logger and how to output process id and app domain id with the default log4net patterns.

2015-07-07 16:18:57 +02:00

log4net.Release.config

Updates the logger and how to output process id and app domain id with the default log4net patterns.

2015-07-07 16:18:57 +02:00

metablogConfig.config

pretty much got 5966 working just need to do some more tests.

2014-12-17 17:08:12 +11:00

metablogConfig.Release.config

added Umbraco.Web.UI containing only web rendering files

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

scripting.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

scripting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

tinyMceConfig.config

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

tinyMceConfig.Release.config

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

trees.config

Gets initial doc type folders working

2015-06-08 17:59:56 +02:00

trees.Release.config

Works on U4-2866 - converted template tree to new tree structure.

2014-11-25 17:59:59 +11:00

umbracoSettings.config

Revert rogue umbracoSettings.config changes (dbaf7c0)

2015-07-17 14:20:05 +02:00

umbracoSettings.Release.config

Merge 7.2.7 into dev-v7

2015-07-14 19:57:56 +02:00

UrlRewriting.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

UrlRewriting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00