Warren Buckley 31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping ...

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs

2018-10-09 09:25:00 +01:00

..

config

Merge branch 'temp8' into temp8-3087-tree-grouping

2018-10-09 09:25:00 +01:00

controls

Renormalize

2018-06-29 19:52:40 +02:00

create

Renormalize

2018-06-29 19:52:40 +02:00

dashboard

base2.js has been moved to that nice farm upstate

2018-08-01 13:35:00 +01:00

developer

packages section is there with translations sections and correct trees

2018-10-05 11:09:33 +02:00

dialogs

Convertion of assigndomain2.aspx to angular (#2897)

2018-09-30 16:02:09 +02:00

Install/Views

Umbraco.Web.UI/Umbraco not /umbraco

2018-06-29 19:51:59 +02:00

js

Renormalize

2018-06-29 19:52:40 +02:00

masterpages

Removes old modal js lib & references

2018-08-02 11:58:10 +01:00

PartialViewMacros/Templates

Cleanup of partial view macro templates for consistency

2018-09-20 14:00:01 +01:00

Views

close on outside click and escape

2018-09-19 16:01:12 +02:00

webservices

Renormalize

2018-06-29 19:52:40 +02:00

ClientRedirect.aspx

Umbraco.Web.UI/Umbraco not /umbraco

2018-06-29 19:51:59 +02:00

create.aspx

Renormalize

2018-06-29 19:52:40 +02:00

Create.aspx.cs

Renormalize

2018-06-29 19:52:40 +02:00

Create.aspx.designer.cs

Renormalize

2018-06-29 19:52:40 +02:00

endPreview.aspx

Renormalize

2018-06-29 19:52:40 +02:00

ping.aspx

Renormalize

2018-06-29 19:52:40 +02:00

treeInit.aspx

Renormalize

2018-06-29 19:52:40 +02:00

TreeInit.aspx.cs

Renormalize

2018-06-29 19:52:40 +02:00

TreeInit.aspx.designer.cs

Renormalize

2018-06-29 19:52:40 +02:00

umbraco.aspx

Renormalize

2018-06-29 19:52:40 +02:00

umbraco.aspx.cs

Renormalize

2018-06-29 19:52:40 +02:00

umbraco.aspx.designer.cs

Renormalize

2018-06-29 19:52:40 +02:00