Shannon aad82360ad Merge branch 'dev-v7' into dev-v7-contenttypeeditor ...

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/app.dev.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web/Umbraco.Web.csproj

2015-06-23 18:27:18 +02:00

..

config/lang

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

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

create

Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros)

2014-10-22 16:44:45 +10:00

dashboard

content dashboard

2013-11-21 11:09:20 +01:00

Images

Removes contour files that were committed by accident

2013-10-25 16:27:09 +11:00

js

doc type folders are a thing

2015-06-08 19:02:35 +02:00

PartialViewMacros/Templates

U4-6133 Update builtin razor snippets to follow Query Builder conventions

2015-01-15 10:38:07 +01:00

Views

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

merge

2013-11-07 17:16:22 +01:00

umbraco.aspx.cs

merge

2013-11-07 17:16:22 +01:00

umbraco.aspx.designer.cs

merge

2013-11-07 17:16:22 +01:00