Shannon 2f9753cc12 Merge branch 'dev-v7' into 7.3.0 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.macroRenderings/app.config

2015-05-05 12:27:01 +10:00

..

AssetInitialization.cs

Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice

2015-03-18 19:06:41 +11:00

CssInitialization.cs

Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice

2015-03-18 19:06:41 +11:00

DependencyPathRenderer.cs

moves classes to sep files

2014-01-08 14:04:30 +11:00

JsInitialization.cs

Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice

2015-03-18 19:06:41 +11:00

JsInitialize.js

Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower.

2015-03-10 13:02:34 +11:00

Main.js

more identity awesome

2015-04-01 13:41:33 +11:00

Resources.Designer.cs

Removes remaining yepnop dependencies

2014-05-05 12:59:34 +02:00

Resources.resx

Removes remaining yepnop dependencies

2014-05-05 12:59:34 +02:00

ServerVariables.js

importing more stuff from Belle proj

2013-05-26 19:54:50 -10:00

ServerVariablesParser.cs

Fixes: U4-6559 ServerVariables parsing - An Item with the same key has already been added

2015-04-27 12:41:19 +10:00