JsDocs comments on listviewhelper (U4-7185)

U4-8325 XSLT macro rendering logs too much in Info mode (after upgrade 7.1.4 => 7.4.0)
Merge pull request #1224 from 0xc0dec/dev-v7
2016-04-14 11:36:24 +02:00 · 2016-04-14 09:34:53 +02:00 · 2016-04-13 20:18:21 +02:00 · 2016-04-13 22:14:21 +05:00 · 2016-04-13 15:57:27 +02:00 · 2016-04-12 13:19:59 +02:00
145 changed files with 3722 additions and 587 deletions
@@ -1,134 +1,135 @@
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-.DS_Store
-._.DS_Store
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-_BuildOutput/*
-*.ncrunchsolution
-build/UmbracoCms.AllBinaries*zip
-build/UmbracoCms.WebPI*zip
-build/UmbracoCms*zip
-build/UmbracoExamine.PDF*zip
-build/*.nupkg
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-*.orig
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-webpihash.txt
-
-node_modules
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-build/_BuildOutput/
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-tools/NDepend/
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
-NDependOut/*
-*.ndproj
-QueryResult.htm
-*.ndproj
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/umbraco/plugins/*
-src/Umbraco.Web.UI/umbraco/js/init.js
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/Umbraco/preview
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
-src/umbraco.sln.ide/*
-build/UmbracoCms.*/
-src/.vs/
-src/Umbraco.Web.UI/umbraco/js/install.loader.js
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+.DS_Store
+._.DS_Store
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_BuildOutput/*
+*.ncrunchsolution
+build/UmbracoCms.AllBinaries*zip
+build/UmbracoCms.WebPI*zip
+build/UmbracoCms*zip
+build/UmbracoExamine.PDF*zip
+build/*.nupkg
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+*.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+tools/NDepend/
+
+src/Umbraco.Web.UI/App_Plugins/*
+src/*.psess
+src/*.vspx
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
+NDependOut/*
+*.ndproj
+QueryResult.htm
+*.ndproj
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+
+src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
+src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
+src/Umbraco.Web.UI/umbraco/plugins/*
+src/Umbraco.Web.UI/umbraco/js/init.js
+build/ApiDocs/*
+build/ApiDocs/Output/*
+src/Umbraco.Web.UI.Client/bower_components/*
+/src/Umbraco.Web.UI/Umbraco/preview
+
+#Ignore Rule for output of generated documentation files from Grunt docserve
+src/Umbraco.Web.UI.Client/docs/api
+src/*.boltdata/
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
+src/umbraco.sln.ide/*
+build/UmbracoCms.*/
+src/.vs/
+src/Umbraco.Web.UI/umbraco/js/install.loader.js
+src/Umbraco.Tests/media
@@ -13,11 +13,11 @@ If you're interested in making changes to Belle make sure to read the [Belle Rea

 ## Umbraco - the simple, flexible and friendly ASP.NET CMS ##

-**More than 177,000 sites trust Umbraco** 
+**More than 350,000 sites trust Umbraco** 

 For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developer's dream and your users will love it too. 

-Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)), you can be sure that the technology is proven, stable and scales.  
+Used by more than 350,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)), you can be sure that the technology is proven, stable and scales.  

 To view more examples, please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)

@@ -17,7 +17,7 @@
    <dependencies>
      <dependency id="UmbracoCms.Core" version="[$version$]" />
      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.0, 4.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.2, 4.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.4.1
+7.4.3
@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.4.1")]
-[assembly: AssemblyInformationalVersion("7.4.1")]
+[assembly: AssemblyFileVersion("7.4.3")]
+[assembly: AssemblyInformationalVersion("7.4.3")]
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.4.1");
+        private static readonly Version Version = new Version("7.4.3");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -487,11 +487,8 @@ namespace Umbraco.Core.Models
            var oldPropertyGroup = PropertyGroups.FirstOrDefault(x => 
                x.PropertyTypes.Any(y => y.Alias == propertyTypeAlias));

-            // reset PropertyGroupId, which will be re-evaluated when the content type
-            // is saved - what is important is group.PropertyTypes - see code in
-            // ContentTypeBaseRepository.PersistUpdatedBaseContentType
-            propertyType.PropertyGroupId = new Lazy<int>(() => default(int));
-            propertyType.ResetDirtyProperties(); // PropertyGroupId must not be dirty
+            // set new group
+            propertyType.PropertyGroupId = newPropertyGroup == null ? null : new Lazy<int>(() => newPropertyGroup.Id, false);

            // remove from old group, if any - add to new group, if any
            if (oldPropertyGroup != null)
@@ -540,7 +537,7 @@ namespace Umbraco.Core.Models
            // re-assign the group's properties to no group
            foreach (var property in group.PropertyTypes)
            {
-                property.PropertyGroupId = new Lazy<int>(() => 0);
+                property.PropertyGroupId = null;
                _propertyTypes.Add(property);
            }

@@ -221,8 +221,9 @@ namespace Umbraco.Core.Models
        }

        /// <summary>
-        /// Gets or Sets the PropertyGroup's Id for which this PropertyType belongs
+        /// Gets or sets the identifier of the PropertyGroup this PropertyType belongs to.
        /// </summary>
+        /// <remarks>For generic properties, the value is <c>null</c>.</remarks>
        [DataMember]
        internal Lazy<int> PropertyGroupId
        {
@@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence.Factories
                    Name = typeDto.Name,
                    SortOrder = typeDto.SortOrder,
                    ValidationRegExp = typeDto.ValidationRegExp,
-                    PropertyGroupId = new Lazy<int>(() => default(int)),
+                    PropertyGroupId = null,
                    CreateDate = dto.CreateDate,
                    UpdateDate = dto.CreateDate
                };
@@ -180,7 +180,7 @@ namespace Umbraco.Core.Persistence.Querying
                case "COALESCE":
                    return string.Format("{0}({1},{2})", operand, left, right);
                default:
-                    return left + " " + operand + " " + right;
+                    return "(" + left + " " + operand + " " + right + ")";
            }
        }

@@ -277,7 +277,7 @@ namespace Umbraco.Core.Persistence.Querying
                case ExpressionType.MemberAccess:
                    // false property , i.e. x => !Trashed
                    SqlParameters.Add(true);
-                    return "NOT (" + o + " = @0)";
+                    return string.Format("NOT ({0} = @{1})", o, SqlParameters.Count - 1);
                default:
                    // could be anything else, such as: x => !x.Path.StartsWith("-20")
                    return "NOT (" + o + ")";
@@ -293,7 +293,7 @@ namespace Umbraco.Core.Persistence.Querying
                case ExpressionType.MemberAccess:
                    // true property, i.e. x => Trashed
                    SqlParameters.Add(true);
-                    return o + " = @0";
+                    return string.Format("({0} = @{1})", o, SqlParameters.Count - 1);
                default:
                    // could be anything else, such as: x => x.Path.StartsWith("-20")
                    return o;
@@ -914,7 +914,7 @@ AND umbracoNode.id <> @id",
                    //check for default templates                    
                    bool? isDefaultTemplate = Convert.ToBoolean(ct.dtIsDefault);
                    int? templateId = ct.dtTemplateId;
-                    if (currDefaultTemplate == -1 && isDefaultTemplate.HasValue && templateId.HasValue)
+                    if (currDefaultTemplate == -1 && isDefaultTemplate.HasValue && isDefaultTemplate.Value && templateId.HasValue)
                    {
                        currDefaultTemplate = templateId.Value;
                    }
@@ -103,10 +103,18 @@ namespace Umbraco.Core.Security
            var backOfficeIdentity = http.User.Identity as UmbracoBackOfficeIdentity;
            if (backOfficeIdentity != null) return backOfficeIdentity;

+            //Check if there's more than one identity assigned and see if it's a UmbracoBackOfficeIdentity and use that
+            var claimsPrincipal = http.User as ClaimsPrincipal;
+            if (claimsPrincipal != null)
+            {
+                backOfficeIdentity = claimsPrincipal.Identities.OfType<UmbracoBackOfficeIdentity>().FirstOrDefault();
+                if (backOfficeIdentity != null) return backOfficeIdentity;
+            }
+
            //Otherwise convert to a UmbracoBackOfficeIdentity if it's auth'd and has the back office session            
            var claimsIdentity = http.User.Identity as ClaimsIdentity;
            if (claimsIdentity != null && claimsIdentity.IsAuthenticated)
-            {
+            {                
                try
                {
                    return UmbracoBackOfficeIdentity.FromClaimsIdentity(claimsIdentity);
@@ -267,11 +267,15 @@ namespace Umbraco.Core.Services
                structure.Add(new XElement("MediaType", allowedType.Alias));
            }

-            var genericProperties = new XElement("GenericProperties");
+            var genericProperties = new XElement("GenericProperties"); // actually, all of them
            foreach (var propertyType in mediaType.PropertyTypes)
            {
                var definition = dataTypeService.GetDataTypeDefinitionById(propertyType.DataTypeDefinitionId);
-                var propertyGroup = mediaType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);
+
+                var propertyGroup = propertyType.PropertyGroupId == null // true generic property
+                    ? null
+                    : mediaType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);
+
                var genericProperty = new XElement("GenericProperty",
                                                   new XElement("Name", propertyType.Name),
                                                   new XElement("Alias", propertyType.Alias),
@@ -381,14 +385,14 @@ namespace Umbraco.Core.Services
                structure.Add(new XElement("DocumentType", allowedType.Alias));
            }

-            var genericProperties = new XElement("GenericProperties");
+            var genericProperties = new XElement("GenericProperties"); // actually, all of them
            foreach (var propertyType in contentType.PropertyTypes)
            {
                var definition = dataTypeService.GetDataTypeDefinitionById(propertyType.DataTypeDefinitionId);

-                var propertyGroup = propertyType.PropertyGroupId == null
-                                                ? null
-                                                : contentType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);
+                var propertyGroup = propertyType.PropertyGroupId == null // true generic property
+                    ? null
+                    : contentType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);

                var genericProperty = new XElement("GenericProperty",
                                                   new XElement("Name", propertyType.Name),
@@ -1380,6 +1380,30 @@ namespace Umbraco.Core
            */
        }

+        public static string EscapeRegexSpecialCharacters(this string text)
+        {
+            var regexSpecialCharacters = new Dictionary<string, string>
+            {
+                {".", @"\."},
+                {"(", @"\("},
+                {")", @"\)"},
+                {"]", @"\]"},
+                {"[", @"\["},
+                {"{", @"\{"},
+                {"}", @"\}"},
+                {"?", @"\?"},
+                {"!", @"\!"},
+                {"$", @"\$"},
+                {"^", @"\^"},
+                {"+", @"\+"},
+                {"*", @"\*"},
+                {"|", @"\|"},
+                {"<", @"\<"},
+                {">", @"\>"}
+            };
+            return ReplaceMany(text, regexSpecialCharacters);
+        }
+
        public static bool ContainsAny(this string haystack, IEnumerable<string> needles, StringComparison comparison = StringComparison.CurrentCulture)
        {
            if (haystack == null) throw new ArgumentNullException("haystack");
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Strings.Css
        public static string ReplaceRule(string input, string oldRuleName, StylesheetRule rule)
        {
            var contents = input;
-            var ruleRegex = new Regex(string.Format(RuleRegexFormat, oldRuleName), RegexOptions.IgnoreCase | RegexOptions.Singleline);
+            var ruleRegex = new Regex(string.Format(RuleRegexFormat, oldRuleName.EscapeRegexSpecialCharacters()), RegexOptions.IgnoreCase | RegexOptions.Singleline);
            contents = ruleRegex.Replace(contents, rule != null ? rule.ToString() : "");
            return contents;
        }
@@ -72,6 +72,11 @@ namespace Umbraco.Core
        /// <summary>
        /// Override init and raise the event
        /// </summary>
+        /// <remarks>
+        /// DID YOU KNOW? The Global.asax Init call is the thing that initializes all of the httpmodules, ties up a bunch of stuff with IIS, etc...
+        /// Therefore, since OWIN is an HttpModule when running in IIS/ASP.Net the OWIN startup is not executed until this method fires and by that
+        /// time, Umbraco has performed it's bootup sequence.
+        /// </remarks>
        public override void Init()
        {
            base.Init();
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Persistence.Querying
                .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]")
                .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]")
                .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"));
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"));

            var sql = new Sql();
            sql.Select("*")
@@ -56,8 +56,8 @@ namespace Umbraco.Tests.Persistence.Querying
                .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]")
                .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]")
                .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"))
-                .Where("[umbracoNode].[id] = @0", 1050);
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"))
+                .Where("([umbracoNode].[id] = @0)", 1050);

            var sql = new Sql();
            sql.Select("*")
@@ -94,9 +94,9 @@ namespace Umbraco.Tests.Persistence.Querying
                .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]")
                .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]")
                .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"))
-                .Where("[umbracoNode].[id] = @0", 1050)
-                .Where("[cmsContentVersion].[VersionId] = @0", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"))
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"))
+                .Where("([umbracoNode].[id] = @0)", 1050)
+                .Where("([cmsContentVersion].[VersionId] = @0)", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"))
                .OrderBy("[cmsContentVersion].[VersionDate] DESC");

            var sql = new Sql();
@@ -133,8 +133,8 @@ namespace Umbraco.Tests.Persistence.Querying
            expected.Select("*");
            expected.From("[cmsPropertyData]");
            expected.InnerJoin("[cmsPropertyType]").On("[cmsPropertyData].[propertytypeid] = [cmsPropertyType].[id]");
-            expected.Where("[cmsPropertyData].[contentNodeId] = @0", 1050);
-            expected.Where("[cmsPropertyData].[versionId] = @0", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"));
+            expected.Where("([cmsPropertyData].[contentNodeId] = @0)", 1050);
+            expected.Where("([cmsPropertyData].[versionId] = @0)", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"));

            var sql = new Sql();
            sql.Select("*")
@@ -22,8 +22,8 @@ namespace Umbraco.Tests.Persistence.Querying
                .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
                .InnerJoin("[umbracoNode]")
                .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
-                .Where("[cmsDocumentType].[IsDefault] = @0", true);
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
+                .Where("([cmsDocumentType].[IsDefault] = @0)", true);

            var sql = new Sql();
            sql.Select("*")
@@ -58,9 +58,9 @@ namespace Umbraco.Tests.Persistence.Querying
                .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
                .InnerJoin("[umbracoNode]")
                .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
                .Where("[cmsDocumentType].[IsDefault] = @0", true)
-                .Where("[umbracoNode].[id] = @0", 1050);
+                .Where("([umbracoNode].[id] = @0)", 1050);

            var sql = new Sql();
            sql.Select("*")
@@ -112,7 +112,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var expected = new Sql();
            expected.Select("*")
                .From("[cmsContentTypeAllowedContentType]")
-                .Where("[cmsContentTypeAllowedContentType].[Id] = @0", 1050);
+                .Where("([cmsContentTypeAllowedContentType].[Id] = @0)", 1050);

            var sql = new Sql();
            sql.Select("*")
@@ -138,7 +138,7 @@ namespace Umbraco.Tests.Persistence.Querying
                .From("[cmsPropertyTypeGroup]")
                .RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
                .InnerJoin("[cmsDataType]").On("[cmsPropertyType].[dataTypeId] = [cmsDataType].[nodeId]")
-                .Where("[cmsPropertyType].[contentTypeId] = @0", 1050);
+                .Where("([cmsPropertyType].[contentTypeId] = @0)", 1050);

            var sql = new Sql();
            sql.Select("*")
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Persistence.Querying
            expected.Select("*")
                .From("[cmsDataType]")
                .InnerJoin("[umbracoNode]").On("[cmsDataType].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"));
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"));

            var sql = new Sql();
            sql.Select("*")
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Persistence.Querying

            Console.WriteLine("Model to Sql ExpressionHelper: \n" + result);

-            Assert.AreEqual("[umbracoNode].[parentID] = @0", result);
+            Assert.AreEqual("([umbracoNode].[parentID] = @0)", result);
            Assert.AreEqual(-1, modelToSqlExpressionHelper.GetSqlParameters()[0]);
        }

@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Persistence.Querying

            Console.WriteLine("Model to Sql ExpressionHelper: \n" + result);

-            Assert.AreEqual("[umbracoUser].[userLogin] = @0", result);
+            Assert.AreEqual("([umbracoUser].[userLogin] = @0)", result);
            Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
        }

@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Persistence.Querying
                .From("[cmsContentVersion]")
                .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]")
                .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"));
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"));

            var sql = new Sql();
            sql.Select("*")
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Persistence.Querying
            expected.Select("*")
                .From("[cmsContentType]")
                .InnerJoin("[umbracoNode]").On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("[umbracoNode].[nodeObjectType] = @0", new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"));
+                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"));

            var sql = new Sql();
            sql.Select("*")
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var content = new NodeDto() {NodeId = 123, Path = "-1,123"};
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId);

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[path]) LIKE upper(@0) AND [umbracoNode].[id] <> @1)", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[path]) LIKE upper(@0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(2, sql.Arguments.Length);
            Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
            Assert.AreEqual(content.NodeId, sql.Arguments[1]);
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var level = 1;
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Level == level && !x.Path.StartsWith("-20"));

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[level] = @0 AND NOT (upper([umbracoNode].[path]) LIKE upper(@1)))", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(2, sql.Arguments.Length);
            Assert.AreEqual(level, sql.Arguments[0]);
            Assert.AreEqual("-20%", sql.Arguments[1]);
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var level = 1;
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false);

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[level] = @0 AND NOT (upper([umbracoNode].[path]) LIKE upper(@1)))", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(2, sql.Arguments.Length);
            Assert.AreEqual(level, sql.Arguments[0]);
            Assert.AreEqual("-20%", sql.Arguments[1]);
@@ -108,7 +108,7 @@ namespace Umbraco.Tests.Persistence.Querying
        {
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text.ToUpper() == "hello".ToUpper());

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) = upper(@0))", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[text]) = upper(@0)))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(1, sql.Arguments.Length);
            Assert.AreEqual("hello", sql.Arguments[0]);
        }
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.Persistence.Querying
        {
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text == 1.ToString());

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[text] = @0)", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[text] = @0))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(1, sql.Arguments.Length);
            Assert.AreEqual("1", sql.Arguments[0]);
        }
@@ -138,7 +138,7 @@ namespace Umbraco.Tests.Persistence.Querying
        {
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.NodeId == 2);

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[id] = @0)", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] = @0))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(1, sql.Arguments.Length);
            Assert.AreEqual(2, sql.Arguments[0]);
        }
@@ -148,7 +148,7 @@ namespace Umbraco.Tests.Persistence.Querying
        {
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.NodeId != 2 && x.NodeId != 3);

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[id] <> @0 AND [umbracoNode].[id] <> @1)", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[id] <> @0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(2, sql.Arguments.Length);
            Assert.AreEqual(2, sql.Arguments[0]);
            Assert.AreEqual(3, sql.Arguments[1]);
@@ -159,7 +159,7 @@ namespace Umbraco.Tests.Persistence.Querying
        {
            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text == "hello" || x.NodeId == 3);

-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[text] = @0 OR [umbracoNode].[id] = @1)", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[text] = @0) OR ([umbracoNode].[id] = @1)))", sql.SQL.Replace("\n", " "));
            Assert.AreEqual(2, sql.Arguments.Length);
            Assert.AreEqual("hello", sql.Arguments[0]);
            Assert.AreEqual(3, sql.Arguments[1]);
@@ -230,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Querying
        public void Can_Use_Where_Predicate()
        {
            var expected = new Sql();
-            expected.Select("*").From("[cmsContent]").Where("[cmsContent].[nodeId] = @0", 1045);
+            expected.Select("*").From("[cmsContent]").Where("([cmsContent].[nodeId] = @0)", 1045);

            var sql = new Sql();
            sql.Select("*").From<ContentDto>().Where<ContentDto>(x => x.NodeId == 1045);
@@ -246,8 +246,8 @@ namespace Umbraco.Tests.Persistence.Querying
            var expected = new Sql();
            expected.Select("*")
                .From("[cmsContent]")
-                .Where("[cmsContent].[nodeId] = @0", 1045)
-                .Where("[cmsContent].[contentType] = @0", 1050);
+                .Where("([cmsContent].[nodeId] = @0)", 1045)
+                .Where("([cmsContent].[contentType] = @0)", 1050);

            var sql = new Sql();
            sql.Select("*")
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var result = translator.Translate();
            var strResult = result.SQL;

-            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE ([umbracoNode].[parentID] = @0)";
+            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([umbracoNode].[parentID] = @0))";

            // Assert
            Assert.That(strResult, Is.Not.Empty);
@@ -83,7 +83,7 @@ namespace Umbraco.Tests.Persistence.Querying
            var result = translator.Translate();
            var strResult = result.SQL;

-            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE ([cmsContentType].[alias] = @0)";
+            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([cmsContentType].[alias] = @0))";

            // Assert
            Assert.That(strResult, Is.Not.Empty);
@@ -90,7 +90,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                    templateRepo.AddOrUpdate(template);
                }
                unitOfWork.Commit();
-                
+
                var contentType = MockedContentTypes.CreateSimpleContentType();
                contentType.AllowedTemplates = new[] {templates[0], templates[1]};
                contentType.SetDefaultTemplate(templates[0]);
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                repository.AddOrUpdate(contentType);
                unitOfWork.Commit();

-                //create a 
+                //create a
                var contentType2 = (IContentType)new ContentType(contentType, "hello")
                {
                    Name = "Blahasdfsadf"
@@ -293,7 +293,9 @@ namespace Umbraco.Tests.Persistence.Repositories
            using (var repository = CreateRepository(unitOfWork))
            {
                // Act
-                var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup");
+                var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType2("test", "Test", propertyGroupName: "testGroup");
+
+                Assert.AreEqual(4, contentType.PropertyTypes.Count());

                // there is NO mapping from display to contentType, but only from save
                // to contentType, so if we want to test, let's to it properly!
@@ -301,12 +303,18 @@ namespace Umbraco.Tests.Persistence.Repositories
                var save = MapToContentTypeSave(display);
                var mapped = Mapper.Map<IContentType>(save);

+                Assert.AreEqual(4, mapped.PropertyTypes.Count());
+
                repository.AddOrUpdate(mapped);
                unitOfWork.Commit();

+                Assert.AreEqual(4, mapped.PropertyTypes.Count());
+
                //re-get
                contentType = repository.Get(mapped.Id);

+                Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
                // Assert
                Assert.That(contentType.HasIdentity, Is.True);
                Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
@@ -316,7 +324,11 @@ namespace Umbraco.Tests.Persistence.Repositories

                Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
                var groupId = contentType.PropertyGroups.ElementAt(0).Id;
-                Assert.That(contentType.PropertyTypes.All(x => x.PropertyGroupId.Value == groupId), Is.True);
+
+                var propertyTypes = contentType.PropertyTypes.ToArray();
+                Assert.AreEqual("gen", propertyTypes[0].Alias); // just to be sure
+                Assert.IsNull(propertyTypes[0].PropertyGroupId);
+                Assert.IsTrue(propertyTypes.Skip(1).All((x => x.PropertyGroupId.Value == groupId)));
            }

        }
@@ -353,7 +365,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
            }

-            
+
        }

        // this is for tests only because it makes no sense at all to have such a
@@ -491,16 +503,16 @@ namespace Umbraco.Tests.Persistence.Repositories
            var provider = new PetaPocoUnitOfWorkProvider(Logger);
            var unitOfWork = provider.GetUnitOfWork();
            using (var repository = CreateRepository(unitOfWork))
-            {                
+            {
                var ctMain = MockedContentTypes.CreateSimpleContentType();
                var ctChild1 = MockedContentTypes.CreateSimpleContentType("child1", "Child 1", ctMain, true);
                var ctChild2 = MockedContentTypes.CreateSimpleContentType("child2", "Child 2", ctChild1, true);
-                
+
                repository.AddOrUpdate(ctMain);
                repository.AddOrUpdate(ctChild1);
-                repository.AddOrUpdate(ctChild2);                
+                repository.AddOrUpdate(ctChild2);
                unitOfWork.Commit();
-                
+
                // Act

                var resolvedParent = repository.Get(ctMain.Id);
@@ -528,7 +540,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                var child3 = MockedContentTypes.CreateSimpleContentType("zyx", "zyx", contentType, randomizeAliases: true);
                repository.AddOrUpdate(child3);
                var child2 = MockedContentTypes.CreateSimpleContentType("a123", "a123", contentType, randomizeAliases: true);
-                repository.AddOrUpdate(child2);                
+                repository.AddOrUpdate(child2);
                unitOfWork.Commit();

                // Act
@@ -540,7 +552,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                Assert.AreEqual("aabc", contentTypes.ElementAt(1).Name);
                Assert.AreEqual("zyx", contentTypes.ElementAt(2).Name);
            }
-            
+
        }

        [Test]
@@ -671,7 +683,7 @@ namespace Umbraco.Tests.Persistence.Repositories
            {
                var contentType = repository.Get(NodeDto.NodeIdSeed + 1);

-                // Act                
+                // Act
                contentType.PropertyGroups["Meta"].PropertyTypes.Remove("description");
                repository.AddOrUpdate(contentType);
                unitOfWork.Commit();
@@ -841,7 +853,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
            }
-            
+
        }

        [Test]
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Persistence.SyntaxProvider
 FROM [cmsContentXml]
 INNER JOIN [umbracoNode]
 ON [cmsContentXml].[nodeId] = [umbracoNode].[id]
-WHERE ([umbracoNode].[nodeObjectType] = @0)) x)".Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "),
+WHERE (([umbracoNode].[nodeObjectType] = @0))) x)".Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "),
                                                sqlOutput.SQL.Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "));

            Assert.AreEqual(1, sqlOutput.Arguments.Length);
@@ -164,6 +164,24 @@ namespace Umbraco.Tests.TestHelpers.Entities
            return contentType;
        }

+        public static ContentType CreateSimpleContentType2(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupName = "Content")
+        {
+            var contentType = CreateSimpleContentType(alias, name, parent, randomizeAliases, propertyGroupName);
+
+            var propertyType = new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext)
+            {
+                Alias = RandomAlias("gen", randomizeAliases),
+                Name = "Gen",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeDefinitionId = -88
+            };
+            contentType.AddPropertyType(propertyType);
+
+            return contentType;
+        }
+
        public static ContentType CreateSimpleContentType(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupName = "Content")
 		{
 			var contentType = parent == null ? new ContentType(-1) : new ContentType(parent, alias);
@@ -20,18 +20,22 @@ namespace Umbraco.Tests.Web.Mvc
        {
            var binder = new RenderModelBinder();
            var found = binder.GetBinder(typeof (IPublishedContent));
-            Assert.IsNotNull(found);
-            found = binder.GetBinder(typeof(IRenderModel));
-            Assert.IsNotNull(found);
+            Assert.IsNotNull(found);            
            found = binder.GetBinder(typeof(RenderModel));
            Assert.IsNotNull(found);
            found = binder.GetBinder(typeof(DynamicPublishedContent));
            Assert.IsNotNull(found);
            found = binder.GetBinder(typeof(MyContent));
            Assert.IsNotNull(found);
+            found = binder.GetBinder(typeof(RenderModel<MyContent>));
+            Assert.IsNotNull(found);

            found = binder.GetBinder(typeof(MyOtherContent));
            Assert.IsNull(found);
+            found = binder.GetBinder(typeof(MyCustomRenderModel));
+            Assert.IsNull(found);            
+            found = binder.GetBinder(typeof(IRenderModel));
+            Assert.IsNull(found);
        }

        [Test]
@@ -142,6 +146,16 @@ namespace Umbraco.Tests.Web.Mvc
            Assert.AreEqual(content, result);
        }

+        public class MyCustomRenderModel : RenderModel
+        {           
+            public MyCustomRenderModel(IPublishedContent content, CultureInfo culture) : base(content, culture)
+            {
+            }            
+            public MyCustomRenderModel(IPublishedContent content) : base(content)
+            {
+            }
+        }
+        
        public class MyOtherContent
        {
            
@@ -1,20 +1,22 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:autoScale
- * @element div
- * @function
- *
- * @description
- * Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
- * So if you only want to scale the div to 70 pixels from the bottom you pass "70"
- *
- * @example
-   <example module="umbraco.directives">
-     <file name="index.html">
-         <div auto-scale="70" class="input-block-level"></div>
-     </file>
-   </example>
- */
+* @ngdoc directive
+* @name umbraco.directives.directive:autoScale
+* @element div
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+* @function
+* @description
+* Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
+* So if you only want to scale the div to 70 pixels from the bottom you pass "70"
+
+* @example
+* <example module="umbraco.directives">
+*    <file name="index.html">
+*        <div auto-scale="70" class="input-block-level"></div>
+*    </file>
+* </example>
+**/
+
 angular.module("umbraco.directives")
  .directive('autoScale', function ($window) {
    return function (scope, el, attrs) {
@@ -35,4 +37,4 @@ angular.module("umbraco.directives")
      });

    };
-  });
+  });
@@ -1,9 +1,12 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbPanel
+* @name umbraco.directives.directive:detectFold
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @description This is used for the editor buttons to ensure they are displayed correctly if the horizontal overflow of the editor
- * exceeds the height of the window
+* exceeds the height of the window
 **/
+
 angular.module("umbraco.directives.html")
 	.directive('detectFold', function ($timeout, $log, windowResizeListener) {
 	    return {
@@ -1,11 +1,14 @@
-/**
+/**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbItemSorter
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @function
 * @element ANY
 * @restrict E
 * @description A re-usable directive for sorting items
 **/
+
 function umbItemSorter(angularHelper) {
    return {
        scope: {
@@ -1,11 +1,14 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbContentName
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 * @function
 * @description
 * Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
+
 angular.module("umbraco.directives")
 	.directive('umbContentName', function ($timeout, localizationService) {
 	    return {
@@ -1,11 +1,14 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbHeader
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 * @function
 * @description
 * The header on an editor that contains tabs using bootstrap tabs - THIS IS OBSOLETE, use umbTabHeader instead
 **/
+
 angular.module("umbraco.directives")
 .directive('umbHeader', function ($parse, $timeout) {
    return {
@@ -1,10 +1,13 @@
-/**
+/**
 * @ngdoc directive
-* @name umbraco.directives.directive:login
+* @name umbraco.directives.directive:umbLogin
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @function
 * @element ANY
 * @restrict E
 **/
+
 function loginDirective() {
    return {
        restrict: "E",    // restrict to an element
@@ -1,3 +1,13 @@
+/**
+* @ngdoc directive
+* @name umbraco.directives.directive:umbOptionsMenu
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+* @function
+* @element ANY
+* @restrict E
+**/
+
 angular.module("umbraco.directives")
 .directive('umbOptionsMenu', function ($injector, treeService, navigationService, umbModelMapper, appState) {
    return {
@@ -1,8 +1,11 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbPhotoFolder
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 **/
+
 angular.module("umbraco.directives.html")
    .directive('umbPhotoFolder', function($compile, $log, $timeout, $filter, umbPhotoFolderHelper) {

@@ -1,20 +1,24 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:umbSort
- * @element div
- * @function
- *
- * @description
- * Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
- * So if you only want to scale the div to 70 pixels from the bottom you pass "70"
- *
- * @example
-   <example module="umbraco.directives">
-     <file name="index.html">
-         <div umb-sort="70" class="input-block-level"></div>
-     </file>
-   </example>
- */
+* @ngdoc directive
+* @name umbraco.directives.directive:umbSort
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
+* @element div
+* @function
+*
+* @description
+* Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
+* So if you only want to scale the div to 70 pixels from the bottom you pass "70"
+*
+* @example
+* <example module="umbraco.directives">
+*     <file name="index.html">
+*         <div umb-sort="70" class="input-block-level"></div>
+*     </file>
+* </example>
+**/
+
 angular.module("umbraco.directives")
  .value('umbSortContextInternal',{})
  .directive('umbSort', function($log,umbSortContextInternal) {
@@ -165,4 +169,4 @@ angular.module("umbraco.directives")
             }
          };

-        });
+        });
@@ -1,8 +1,12 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbTabView
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
 * @restrict E
 **/
+
 angular.module("umbraco.directives")
 .directive('umbTabView', function($timeout, $log){
 	return {
@@ -1,8 +1,12 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbUploadDropzone
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
 * @restrict E
 **/
+
 angular.module("umbraco.directives.html")
 	.directive('umbUploadDropzone', function(){
 		return {
@@ -1,3 +1,71 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbButton
+@restrict E
+@scope
+
+@description
+Use this directive to render an umbraco button. The directive can be used to generate all types of buttons, set type, style, translation, shortcut and much more.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-button
+            action="vm.clickButton()"
+            type="button"
+            button-style="success"
+            state="vm.buttonState"
+            shortcut="ctrl+c"
+            label="My button"
+            disabled="vm.buttonState === 'busy'">
+        </umb-button>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+            vm.buttonState = "init";
+
+            vm.clickButton = clickButton;
+
+            function clickButton() {
+
+                vm.buttonState = "busy";
+
+                myService.clickButton().then(function() {
+                    vm.buttonState = "success";
+                }, function() {
+                    vm.buttonState = "error";
+                });
+
+            }
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+
+    })();
+</pre>
+
+@param {callback} action The button action which should be performed when the button is clicked.
+@param {string=} href Url/Path to navigato to.
+@param {string=} type Set the button type ("button" or "submit").
+@param {string=} buttonStyle Set the style of the button. The directive uses the default bootstrap styles ("primary", "info", "success", "warning", "danger", "inverse", "link").
+@param {string=} state Set a progress state on the button ("init", "busy", "success", "error").
+@param {string=} shortcut Set a keyboard shortcut for the button ("ctrl+c").
+@param {string=} label Set the button label.
+@param {string=} labelKey Set a localization key to make a multi lingual button ("general_buttonText").
+@param {string=} icon Set a button icon. Can only be used when buttonStyle is "link".
+@param {boolean=} disabled Set to <code>true</code> to disable the button.
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,94 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbButtonGroup
+@restrict E
+@scope
+
+@description
+Use this directive to render a button with a dropdown of alternative actions.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-button-group
+           ng-if="vm.buttonGroup"
+           default-button="vm.buttonGroup.defaultButton"
+           sub-buttons="vm.buttonGroup.subButtons"
+           direction="down"
+           float="right">
+        </umb-button-group>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+            vm.buttonGroup = {
+                defaultButton: {
+                    labelKey: "general_defaultButton",
+                    hotKey: "ctrl+d",
+                    hotKeyWhenHidden: true,
+                    handler: function() {
+                        // do magic here
+                    }
+                },
+                subButtons: [
+                    {
+                        labelKey: "general_subButton",
+                        hotKey: "ctrl+b",
+                        hotKeyWhenHidden: true,
+                        handler: function() {
+                            // do magic here
+                        }
+                    }
+                ]
+            };
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+
+    })();
+</pre>
+
+<h3>Button model description</h3>
+<ul>
+    <li>
+        <strong>labekKey</strong>
+        <small>(string)</small> -
+        Set a localization key to make a multi lingual button ("general_buttonText").
+    </li>
+    <li>
+        <strong>hotKey</strong>
+        <small>(array)</small> -
+        Set a keyboard shortcut for the button ("ctrl+c").
+    </li>
+    <li>
+        <strong>hotKeyWhenHidden</strong>
+        <small>(boolean)</small> -
+        As a default the hotkeys only works on elements visible in the UI. Set to <code>true</code> to set a hotkey on the hidden sub buttons.
+    </li>
+    <li>
+        <strong>handler</strong>
+        <small>(callback)</small> -
+        Set a callback to handle button click events.
+    </li>
+</ul>
+
+@param {object} defaultButton The model of the default button.
+@param {array} subButtons Array of sub buttons.
+@param {string=} state Set a progress state on the button ("init", "busy", "success", "error").
+@param {string=} direction Set the direction of the dropdown ("up", "down").
+@param {string=} float Set the float of the dropdown. ("left", "right").
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,43 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorSubHeader
+@restrict E
+
+@description
+Use this directive to construct a sub header in the main editor window.
+The sub header is sticky and will follow along down the page when scrolling.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-container>
+
+                    <umb-editor-sub-header>
+                        // sub header content here
+                    </umb-editor-sub-header>
+
+                </umb-editor-container>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,50 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorSubHeaderContentLeft
+@restrict E
+
+@description
+Use this directive to left align content in a sub header in the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-container>
+
+                    <umb-editor-sub-header>
+
+                        <umb-editor-sub-header-content-left>
+                            // left content here
+                        </umb-editor-sub-header-content-left>
+
+                        <umb-editor-sub-header-content-right>
+                            // right content here
+                        </umb-editor-sub-header-content-right>
+
+                    </umb-editor-sub-header>
+
+                </umb-editor-container>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,50 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorSubHeaderContentRight
+@restrict E
+
+@description
+Use this directive to rigt align content in a sub header in the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-container>
+
+                    <umb-editor-sub-header>
+
+                        <umb-editor-sub-header-content-left>
+                            // left content here
+                        </umb-editor-sub-header-content-left>
+
+                        <umb-editor-sub-header-content-right>
+                            // right content here
+                        </umb-editor-sub-header-content-right>
+
+                    </umb-editor-sub-header>
+
+                </umb-editor-container>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,58 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorSubHeaderSection
+@restrict E
+
+@description
+Use this directive to create sections, divided by borders, in a sub header in the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-container>
+
+                    <umb-editor-sub-header>
+
+                        <umb-editor-sub-header-content-right>
+
+                            <umb-editor-sub-header-section>
+                                // section content here
+                            </umb-editor-sub-header-section>
+
+                            <umb-editor-sub-header-section>
+                                // section content here
+                            </umb-editor-sub-header-section>
+
+                            <umb-editor-sub-header-section>
+                                // section content here
+                            </umb-editor-sub-header-section>
+
+                        </umb-editor-sub-header-content-right>
+
+                    </umb-editor-sub-header>
+
+                </umb-editor-container>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
+    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,47 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbBreadcrumbs
+@restrict E
+@scope
+
+@description
+Use this directive to generate a list of breadcrumbs.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+        <umb-breadcrumbs
+            ng-if="vm.ancestors && vm.ancestors.length > 0"
+            ancestors="vm.ancestors"
+            entity-type="content">
+        </umb-breadcrumbs>
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+            vm.ancestors = [];
+
+            myService.getAncestors().then(function(ancestors){
+                vm.ancestors = ancestors;
+            });
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {array} ancestors Array of ancestors
+@param {string} entityType The content entity type (member, media, content).
+**/
+
 (function() {
  'use strict';

@@ -1,3 +1,42 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorContainer
+@restrict E
+
+@description
+Use this directive to construct a main content area inside the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="Umbraco.Controller as vm">
+
+        <umb-editor-view>
+
+            <umb-editor-header
+                // header configuration>
+            </umb-editor-header>
+
+            <umb-editor-container>
+                // main content here
+            </umb-editor-container>
+
+            <umb-editor-footer>
+                // footer content here
+            </umb-editor-footer>
+
+        </umb-editor-view>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
+    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,48 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorFooter
+@restrict E
+
+@description
+Use this directive to construct a footer inside the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-header
+                    // header configuration>
+                </umb-editor-header>
+
+                <umb-editor-container>
+                    // main content here
+                </umb-editor-container>
+
+                <umb-editor-footer>
+                    // footer content here
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
+    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooterContentLeft umbEditorFooterContentLeft}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooterContentRight umbEditorFooterContentRight}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,48 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorFooterContentLeft
+@restrict E
+
+@description
+Use this directive to align content left inside the main editor footer.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-footer>
+
+                    <umb-editor-footer-content-left>
+                        // align content left
+                    </umb-editor-footer-content-left>
+
+                    <umb-editor-footer-content-right>
+                        // align content right
+                    </umb-editor-footer-content-right>
+
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
+    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooterContentRight umbEditorFooterContentRight}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,48 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorFooterContentRight
+@restrict E
+
+@description
+Use this directive to align content right inside the main editor footer.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-footer>
+
+                    <umb-editor-footer-content-left>
+                        // align content left
+                    </umb-editor-footer-content-left>
+
+                    <umb-editor-footer-content-right>
+                        // align content right
+                    </umb-editor-footer-content-right>
+
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
+    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooterContentLeft umbEditorFooterContentLeft}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,206 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorHeader
+@restrict E
+@scope
+
+@description
+Use this directive to construct a header inside the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-header
+                    name="vm.content.name"
+                    hide-alias="true"
+                    hide-description="true"
+                    hide-icon="true">
+                </umb-editor-header>
+
+                <umb-editor-container>
+                    // main content here
+                </umb-editor-container>
+
+                <umb-editor-footer>
+                    // footer content here
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Markup example - with tabs</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" val-form-manager novalidate>
+
+            <umb-editor-view umb-tabs>
+
+                <umb-editor-header
+                    name="vm.content.name"
+                    tabs="vm.content.tabs"
+                    hide-alias="true"
+                    hide-description="true"
+                    hide-icon="true">
+                </umb-editor-header>
+
+                <umb-editor-container>
+                    <umb-tabs-content class="form-horizontal" view="true">
+                        <umb-tab id="tab{{tab.id}}" ng-repeat="tab in vm.content.tabs" rel="{{tab.id}}">
+
+                            <div ng-show="tab.alias==='tab1'">
+                                // tab 1 content
+                            </div>
+
+                            <div ng-show="tab.alias==='tab2'">
+                                // tab 2 content
+                            </div>
+
+                        </umb-tab>
+                    </umb-tabs-content>
+                </umb-editor-container>
+
+                <umb-editor-footer>
+                    // footer content here
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Controller example - with tabs</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.content = {
+                name: "",
+                tabs: [
+                    {
+                        id: 1,
+                        label: "Tab 1",
+                        alias: "tab1",
+                        active: true
+                    },
+                    {
+                        id: 2,
+                        label: "Tab 2",
+                        alias: "tab2",
+                        active: false
+                    }
+                ]
+            };
+
+        }
+
+        angular.module("umbraco").controller("MySection.Controller", Controller);
+    })();
+</pre>
+
+<h3>Markup example - with sub views</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" val-form-manager novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-header
+                    name="vm.content.name"
+                    navigation="vm.content.navigation"
+                    hide-alias="true"
+                    hide-description="true"
+                    hide-icon="true">
+                </umb-editor-header>
+
+                <umb-editor-container>
+
+                    <umb-editor-sub-views
+                        sub-views="vm.content.navigation"
+                        model="vm.content">
+                    </umb-editor-sub-views>
+
+                </umb-editor-container>
+
+                <umb-editor-footer>
+                    // footer content here
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+
+<h3>Controller example - with sub views</h3>
+<pre>
+    (function () {
+
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.content = {
+                name: "",
+                navigation: [
+                    {
+                        "name": "Section 1",
+                        "icon": "icon-document-dashed-line",
+                        "view": "/App_Plugins/path/to/html.html",
+                        "active": true
+                    },
+                    {
+                        "name": "Section 2",
+                        "icon": "icon-list",
+                        "view": "/App_Plugins/path/to/html.html",
+                    }
+                ]
+            };
+
+        }
+
+        angular.module("umbraco").controller("MySection.Controller", Controller);
+    })();
+</pre>
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
+    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
+</ul>
+
+@param {string} name The content name.
+@param {array=} tabs Array of tabs. See example above.
+@param {array=} navigation Array of sub views. See example above.
+@param {boolean=} nameLocked Set to <code>true</code> to lock the name.
+@param {object=} menu Add a context menu to the editor.
+@param {string=} icon Show and edit the content icon. Opens an overlay to change the icon.
+@param {boolean=} hideIcon Set to <code>true</code> to hide icon.
+@param {string=} alias show and edit the content alias.
+@param {boolean=} hideAlias Set to <code>true</code> to hide alias.
+@param {string=} description Add a description to the content.
+@param {boolean=} hideDescription Set to <code>true</code> to hide description.
+
+**/
+
 (function() {
    'use strict';

@@ -1,3 +1,66 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEditorView
+@restrict E
+@scope
+
+@description
+Use this directive to construct the main editor window.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="MySection.Controller as vm">
+
+        <form name="mySectionForm" novalidate>
+
+            <umb-editor-view>
+
+                <umb-editor-header
+                    name="vm.content.name"
+                    hide-alias="true"
+                    hide-description="true"
+                    hide-icon="true">
+                </umb-editor-header>
+
+                <umb-editor-container>
+                    // main content here
+                </umb-editor-container>
+
+                <umb-editor-footer>
+                    // footer content here
+                </umb-editor-footer>
+
+            </umb-editor-view>
+
+        </form>
+
+    </div>
+</pre>
+<h3>Controller example</h3>
+<pre>
+    (function () {
+
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+        }
+
+        angular.module("umbraco").controller("MySection.Controller", Controller);
+    })();
+</pre>
+
+
+<h3>Use in combination with</h3>
+<ul>
+    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
+    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
+    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
+</ul>
+**/
+
 (function() {
   'use strict';

@@ -1,7 +1,8 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:headline
- **/
+* @ngdoc directive
+* @name umbraco.directives.directive:hotkey
+**/
+
 angular.module("umbraco.directives")
    .directive('hotkey', function($window, keyboardService, $log) {

@@ -1,13 +1,23 @@
 /**
-* @ngdoc directive
-* @name umbraco.directives.directive:preventDefault
+@ngdoc directive
+@name umbraco.directives.directive:preventDefault
+
+@description
+Use this directive to prevent default action of an element. Effectively implementing <a href="https://api.jquery.com/event.preventdefault/">jQuery's preventdefault</a>
+
+<h3>Markup example</h3>
+
+<pre>
+    <a href="https://umbraco.com" prevent-default>Don't go to Umbraco.com</a>
+</pre>
+
 **/
 angular.module("umbraco.directives")
    .directive('preventDefault', function() {
        return function(scope, element, attrs) {

            var enabled = true;
-            //check if there's a value for the attribute, if there is and it's false then we conditionally don't 
+            //check if there's a value for the attribute, if there is and it's false then we conditionally don't
            //prevent default.
            if (attrs.preventDefault) {
                attrs.$observe("preventDefault", function (newVal) {
@@ -26,4 +36,4 @@ angular.module("umbraco.directives")
                }
            });
        };
-    });
+    });
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbProperty
+* @name umbraco.directives.directive:umbControlGroup
 * @restrict E
 **/
 angular.module("umbraco.directives.html")
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbProperty
+* @name umbraco.directives.directive:umbPane
 * @restrict E
 **/
 angular.module("umbraco.directives.html")
@@ -1,10 +1,9 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbCropsy
+* @name umbraco.directives.directive:umbImageGravity
 * @restrict E
 * @function
 * @description
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
 angular.module("umbraco.directives")
 	.directive('umbImageGravity', function ($timeout, localizationService, $log) {
@@ -1,10 +1,9 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbCropsy
+* @name umbraco.directives.directive:umbImageThumbnail
 * @restrict E
 * @function
 * @description
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
 angular.module("umbraco.directives")
 	.directive('umbImageThumbnail',
@@ -1,8 +1,409 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:umbProperty
- * @restrict E
- **/
+@ngdoc directive
+@name umbraco.directives.directive:umbOverlay
+@restrict E
+@scope
+
+@description
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <button type="button" ng-click="vm.openOverlay()"></button>
+
+        <umb-overlay
+            ng-if="vm.overlay.show"
+            model="vm.overlay"
+            view="vm.overlay.view"
+            position="right">
+        </umb-overlay>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+            vm.openOverlay = openOverlay;
+
+            function openOverlay() {
+
+                vm.overlay = {
+                    view: "mediapicker",
+                    show: true,
+                    submit: function(model) {
+
+                        vm.overlay.show = false;
+                        vm.overlay = null;
+                    },
+                    close: function(oldModel) {
+                        vm.overlay.show = false;
+                        vm.overlay = null;
+                    }
+                }
+
+            };
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+<h1>General Options</h1>
+Lorem ipsum dolor sit amet..
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tr>
+        <td>model.title</td>
+        <td>String</td>
+        <td>Set the title of the overlay.</td>
+    </tr>
+    <tr>
+        <td>model.subTitle</td>
+        <td>String</td>
+        <td>Set the subtitle of the overlay.</td>
+    </tr>
+    <tr>
+        <td>model.submitButtonLabel</td>
+        <td>String</td>
+        <td>Set an alternate submit button text</td>
+    </tr>
+    <tr>
+        <td>model.submitButtonLabelKey</td>
+        <td>String</td>
+        <td>Set an alternate submit button label key for localized texts</td>
+    </tr>
+    <tr>
+        <td>model.hideSubmitButton</td>
+        <td>Boolean</td>
+        <td>Hides the submit button</td>
+    </tr>
+    <tr>
+        <td>model.closeButtonLabel</td>
+        <td>String</td>
+        <td>Set an alternate close button text</td>
+    </tr>
+    <tr>
+        <td>model.closeButtonLabelKey</td>
+        <td>String</td>
+        <td>Set an alternate close button label key for localized texts</td>
+    </tr>
+    <tr>
+        <td>model.show</td>
+        <td>Boolean</td>
+        <td>Show/hide the overlay</td>
+    </tr>
+    <tr>
+        <td>model.submit</td>
+        <td>Function</td>
+        <td>Callback function when the overlay submits. Returns the overlay model object</td>
+    </tr>
+    <tr>
+        <td>model.close</td>
+        <td>Function</td>
+        <td>Callback function when the overlay closes. Returns a copy of the overlay model object before being modified</td>
+    </tr>
+</table>
+
+
+<h1>Content Picker</h1>
+Opens a content picker.</br>
+<strong>view: </strong>contentpicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tr>
+        <td>model.multiPicker</td>
+        <td>Boolean</td>
+        <td>Pick one or multiple items</td>
+    </tr>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tr>
+        <td>model.selection</td>
+        <td>Array</td>
+        <td>Array of content objects</td>
+    </tr>
+</table>
+
+
+<h1>Icon Picker</h1>
+Opens an icon picker.</br>
+<strong>view: </strong>iconpicker
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tr>
+        <td>model.icon</td>
+        <td>String</td>
+        <td>The icon class</td>
+    </tr>
+</table>
+
+<h1>Item Picker</h1>
+Opens an item picker.</br>
+<strong>view: </strong>itempicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.availableItems</td>
+            <td>Array</td>
+            <td>Array of available items</td>
+        </tr>
+        <tr>
+            <td>model.selectedItems</td>
+            <td>Array</td>
+            <td>Array of selected items. When passed in the selected items will be filtered from the available items.</td>
+        </tr>
+        <tr>
+            <td>model.filter</td>
+            <td>Boolean</td>
+            <td>Set to false to hide the filter</td>
+        </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tr>
+        <td>model.selectedItem</td>
+        <td>Object</td>
+        <td>The selected item</td>
+    </tr>
+</table>
+
+<h1>Macro Picker</h1>
+Opens a media picker.</br>
+<strong>view: </strong>macropicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.dialogData</td>
+            <td>Object</td>
+            <td>Object which contains array of allowedMacros. Set to <code>null</code> to allow all.</td>
+        </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.macroParams</td>
+            <td>Array</td>
+            <td>Array of macro params</td>
+        </tr>
+        <tr>
+            <td>model.selectedMacro</td>
+            <td>Object</td>
+            <td>The selected macro</td>
+        </tr>
+    </tbody>
+</table>
+
+<h1>Media Picker</h1>
+Opens a media picker.</br>
+<strong>view: </strong>mediapicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.multiPicker</td>
+            <td>Boolean</td>
+            <td>Pick one or multiple items</td>
+        </tr>
+        <tr>
+            <td>model.onlyImages</td>
+            <td>Boolean</td>
+            <td>Only display files that have an image file-extension</td>
+        </tr>
+        <tr>
+            <td>model.disableFolderSelect</td>
+            <td>Boolean</td>
+            <td>Disable folder selection</td>
+        </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.selectedImages</td>
+            <td>Array</td>
+            <td>Array of selected images</td>
+        </tr>
+    </tbody>
+</table>
+
+<h1>Member Group Picker</h1>
+Opens a member group picker.</br>
+<strong>view: </strong>membergrouppicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.multiPicker</td>
+            <td>Boolean</td>
+            <td>Pick one or multiple items</td>
+        </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.selectedMemberGroup</td>
+            <td>String</td>
+            <td>The selected member group</td>
+        </tr>
+        <tr>
+            <td>model.selectedMemberGroups (multiPicker)</td>
+            <td>Array</td>
+            <td>The selected member groups</td>
+        </tr>
+    </tbody>
+</table>
+
+<h1>Member Picker</h1>
+Opens a member picker. </br>
+<strong>view: </strong>memberpicker
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.multiPicker</td>
+            <td>Boolean</td>
+            <td>Pick one or multiple items</td>
+        </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+        <tr>
+            <th>Returns</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.selection</td>
+            <td>Array</td>
+            <td>Array of selected members/td>
+        </tr>
+    </tbody>
+</table>
+
+<h1>YSOD</h1>
+Opens an overlay to show a custom YSOD. </br>
+<strong>view: </strong>ysod
+<table>
+    <thead>
+        <tr>
+            <th>Param</th>
+            <th>Type</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>model.error</td>
+            <td>Object</td>
+            <td>Error object</td>
+        </tr>
+    </tbody>
+</table>
+
+@param {object} model Overlay options.
+@param {string} view Path to view or one of the default view names.
+@param {string} position The overlay position ("left", "right", "center": "target").
+**/

 (function() {
   'use strict';
@@ -1,3 +1,52 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbGenerateAlias
+@restrict E
+@scope
+
+@description
+Use this directive to generate a camelCased umbraco alias.
+When the aliasFrom value is changed the directive will get a formatted alias from the server and update the alias model. If "enableLock" is set to <code>true</code>
+the directive will use {@link umbraco.directives.directive:umbLockedField umbLockedField} to lock and unlock the alias.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <input type="text" ng-model="vm.name" />
+
+        <umb-generate-alias
+            enable-lock="true"
+            alias-from="vm.name"
+            alias="vm.alias">
+        </umb-generate-alias>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+            vm.name = "";
+            vm.alias = "";
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {string} alias (<code>binding</code>): The model where the alias is bound.
+@param {string} aliasFrom (<code>binding</code>): The model to generate the alias from.
+@param {boolean=} enableLock (<code>binding</code>): Set to <code>true</code> to add a lock next to the alias from where it can be unlocked and changed.
+**/
+
 angular.module("umbraco.directives")
    .directive('umbGenerateAlias', function ($timeout, entityResource) {
        return {
@@ -1,3 +1,117 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbChildSelector
+@restrict E
+@scope
+
+@description
+Use this directive to render a ui component for selecting child items to a parent node.
+
+<h3>Markup example</h3>
+<pre>
+	<div ng-controller="My.Controller as vm">
+
+        <umb-child-selector
+                selected-children="vm.selectedChildren"
+                available-children="vm.availableChildren"
+                parent-name="vm.name"
+                parent-icon="vm.icon"
+                parent-id="vm.id"
+                on-add="vm.addChild"
+                on-remove="vm.removeChild">
+        </umb-child-selector>
+
+        <!-- use overlay to select children from -->
+        <umb-overlay
+           ng-if="vm.overlay.show"
+           model="vm.overlay"
+           position="target"
+           view="vm.overlay.view">
+        </umb-overlay>
+
+	</div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+	(function () {
+		"use strict";
+
+		function Controller() {
+
+            var vm = this;
+
+            vm.id = 1;
+            vm.name = "My Parent element";
+            vm.icon = "icon-document";
+            vm.selectedChildren = [];
+            vm.availableChildren = [
+                {
+                    id: 1,
+                    alias: "item1",
+                    name: "Item 1",
+                    icon: "icon-document"
+                },
+                {
+                    id: 2,
+                    alias: "item2",
+                    name: "Item 2",
+                    icon: "icon-document"
+                }
+            ];
+
+            vm.addChild = addChild;
+            vm.removeChild = removeChild;
+
+            function addChild($event) {
+                vm.overlay = {
+                    view: "itempicker",
+                    title: "Choose child",
+                    availableItems: vm.availableChildren,
+                    selectedItems: vm.selectedChildren,
+                    event: $event,
+                    show: true,
+                    submit: function(model) {
+
+                        // add selected child
+                        vm.selectedChildren.push(model.selectedItem);
+
+                        // close overlay
+                        vm.overlay.show = false;
+                        vm.overlay = null;
+                    }
+                };
+            }
+
+            function removeChild($index) {
+                vm.selectedChildren.splice($index, 1);
+            }
+
+        }
+
+		angular.module("umbraco").controller("My.Controller", Controller);
+
+	})();
+</pre>
+
+@param {array} selectedChildren (<code>binding</code>): Array of selected children.
+@param {array} availableChildren (<code>binding</code>: Array of items available for selection.
+@param {string} parentName (<code>binding</code>): The parent name.
+@param {string} parentIcon (<code>binding</code>): The parent icon.
+@param {number} parentId (<code>binding</code>): The parent id.
+@param {callback} onRemove (<code>binding</code>): Callback when the remove button is clicked on an item.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>child</code>: The selected item.</li>
+        <li><code>$index</code>: The selected item index.</li>
+    </ul>
+@param {callback} onAdd (<code>binding</code>): Callback when the add button is clicked.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>$event</code>: The select event.</li>
+    </ul>
+**/
+
 (function() {
    'use strict';

@@ -1,3 +1,69 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbConfirmAction
+@restrict E
+@scope
+
+@description
+<p>Use this directive to toggle a confirmation prompt for an action.
+The prompt consists of a checkmark and a cross to confirm or cancel the action.
+The prompt can be opened in four direction up, down, left or right.</p>
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <div class="my-action" style="position:relative;">
+            <i class="icon-trash" ng-click="vm.showPrompt()"></i>
+            <umb-confirm-action
+                ng-if="vm.promptIsVisible"
+                direction="left"
+                on-confirm="vm.confirmAction()"
+                on-cancel="vm.hidePrompt()">
+            </umb-confirm-action>
+        </div>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.promptIsVisible = false;
+
+            vm.confirmAction = confirmAction;
+            vm.showPrompt = showPrompt;
+            vm.hidePrompt = hidePrompt;
+
+            function confirmAction() {
+                // confirm logic here
+            }
+
+            function showPrompt() {
+                vm.promptIsVisible = true;
+            }
+
+            function hidePrompt() {
+                vm.promptIsVisible = false;
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {string} direction The direction the prompt opens ("up", "down", "left", "right").
+@param {callback} onConfirm Callback when the checkmark is clicked.
+@param {callback} onCancel Callback when the cross is clicked.
+**/
+
 (function() {
  'use strict';

@@ -1,3 +1,108 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbContentGrid
+@restrict E
+@scope
+
+@description
+Use this directive to generate a list of content items presented as a flexbox grid.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-content-grid
+            content="vm.contentItems"
+            content-properties="vm.includeProperties"
+            on-click="vm.selectItem"
+            on-click-name="vm.clickItem">
+        </umb-content-grid>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.contentItems = [
+                {
+                    "name": "Cape",
+                    "published": true,
+                    "icon": "icon-document",
+                    "updateDate": "15-02-2016",
+                    "owner": "Mr. Batman",
+                    "selected": false
+                },
+                {
+                    "name": "Utility Belt",
+                    "published": true,
+                    "icon": "icon-document",
+                    "updateDate": "15-02-2016",
+                    "owner": "Mr. Batman",
+                    "selected": false
+                },
+                {
+                    "name": "Cave",
+                    "published": true,
+                    "icon": "icon-document",
+                    "updateDate": "15-02-2016",
+                    "owner": "Mr. Batman",
+                    "selected": false
+                }
+            ];
+            vm.includeProperties = [
+                {
+                  "alias": "updateDate",
+                  "header": "Last edited"
+                },
+                {
+                  "alias": "owner",
+                  "header": "Created by"
+                }
+            ];
+
+            vm.clickItem = clickItem;
+            vm.selectItem = selectItem;
+
+
+            function clickItem(item, $event, $index){
+                // do magic here
+            }
+
+            function selectItem(item, $event, $index) {
+                // set item.selected = true; to select the item
+                // do magic here
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {array} content (<code>binding</code>): Array of content items.
+@param {array=} contentProperties (<code>binding</code>): Array of content item properties to include in the item. If left empty the item will only show the item icon and name.
+@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the content item.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>item</code>: The clicked item</li>
+        <li><code>$event</code>: The select event</li>
+        <li><code>$index</code>: The item index</li>
+    </ul>
+@param {callback=} onClickName (<code>binding</code>): Callback method to handle click events on the checkmark icon.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>item</code>: The selected item</li>
+        <li><code>$event</code>: The select event</li>
+        <li><code>$index</code>: The item index</li>
+    </ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,29 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbEmptyState
+@restrict E
+@scope
+
+@description
+Use this directive to show an empty state message.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-empty-state
+            ng-if="!vm.items"
+            position="center">
+            // Empty state content
+        </umb-empty-state>
+
+    </div>
+</pre>
+
+@param {string=} size Set the size of the text ("small", "large").
+@param {string=} position Set the position of the text ("center").
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,83 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbFolderGrid
+@restrict E
+@scope
+
+@description
+Use this directive to generate a list of folders presented as a flexbox grid.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+        <umb-folder-grid
+            ng-if="vm.folders.length > 0"
+            folders="vm.folders"
+            on-click="vm.clickFolder"
+            on-select="vm.selectFolder">
+        </umb-folder-grid>
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+            vm.folders = [
+                {
+                    "name": "Folder 1",
+                    "icon": "icon-folder",
+                    "selected": false
+                },
+                {
+                    "name": "Folder 2",
+                    "icon": "icon-folder",
+                    "selected": false
+                }
+
+            ];
+
+            vm.clickFolder = clickFolder;
+            vm.selectFolder = selectFolder;
+
+            myService.getFolders().then(function(folders){
+                vm.folders = folders;
+            });
+
+            function clickFolder(folder){
+                // Execute when clicking folder name/link
+            }
+
+            function selectFolder(folder, event, index) {
+                // Execute when clicking folder
+                // set folder.selected = true; to show checkmark icon
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {array} folders (<code>binding</code>): Array of folders
+@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the folder.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>folder</code>: The selected folder</li>
+    </ul>
+@param {callback=} onSelect (<code>binding</code>): Callback method to handle click events on the checkmark icon.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>folder</code>: The selected folder</li>
+        <li><code>$event</code>: The select event</li>
+        <li><code>$index</code>: The folder index</li>
+    </ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,112 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbkeyboardShortcutsOverview
+@restrict E
+@scope
+
+@description
+
+<p>Use this directive to show an overview of keyboard shortcuts in an editor.
+The directive will render an overview trigger wich shows how the overview is opened.
+When this combination is hit an overview is opened with shortcuts based on the model sent to the directive.</p>
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-keyboard-shortcuts-overview
+            model="vm.keyboardShortcutsOverview">
+        </umb-keyboard-shortcuts-overview>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+            vm.keyboardShortcutsOverview = [
+                {
+                    "name": "Sections",
+                    "shortcuts": [
+                        {
+                            "description": "Navigate sections",
+                            "keys": [
+                                {"key": "1"},
+                                {"key": "4"}
+                            ],
+                            "keyRange": true
+                        }
+                    ]
+                },
+                {
+                    "name": "Design",
+                    "shortcuts": [
+                        {
+                            "description": "Add tab",
+                            "keys": [
+                                {"key": "alt"},
+                                {"key": "shift"},
+                                {"key": "t"}
+                            ]
+                        }
+                    ]
+                }
+            ];
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+<h3>Model description</h3>
+<ul>
+    <li>
+        <strong>name</strong>
+        <small>(string)</small> -
+        Sets the shortcut section name.
+    </li>
+    <li>
+        <strong>shortcuts</strong>
+        <small>(array)</small> -
+        Array of available shortcuts in the section.
+    </li>
+    <ul>
+        <li>
+            <strong>description</strong>
+            <small>(string)</small> -
+            Short description of the shortcut.
+        </li>
+        <li>
+            <strong>keys</strong>
+            <small>(array)</small> -
+            Array of keys in the shortcut.
+        </li>
+        <ul>
+            <li>
+                <strong>key</strong>
+                <small>(string)</small> -
+                The invidual key in the shortcut.
+            </li>
+        </ul>
+        <li>
+            <strong>keyRange</strong>
+            <small>(boolean)</small> -
+            Set to <code>true</code> to show a key range. It combines the shortcut keys with "-" instead of "+".
+        </li>
+    </ul>
+</ul>
+
+@param {object} model keyboard shortcut model. See description and example above.
+**/
+
 (function() {
  'use strict';

@@ -1,3 +1,50 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbLoadIndicator
+@restrict E
+
+@description
+Use this directive to generate a loading indicator.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-load-indicator
+            ng-if="vm.loading">
+        </umb-load-indicator>
+
+        <div class="content" ng-if="!vm.loading">
+            <p>{{content}}</p>
+        </div>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+
+            vm.content = "";
+            vm.loading = true;
+
+            myService.getContent().then(function(content){
+                vm.content = content;
+                vm.loading = false;
+            });
+
+        }
+½
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+**/
+
 (function() {
  'use strict';

@@ -1,11 +1,48 @@
 /**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbContentName 
-* @restrict E
-* @function
-* @description 
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
+@ngdoc directive
+@name umbraco.directives.directive:umbLockedField
+@restrict E
+@scope
+
+@description
+Use this directive to render a value with a lock next to it. When the lock is clicked the value gets unlocked and can be edited.
+
+<h3>Markup example</h3>
+<pre>
+	<div ng-controller="My.Controller as vm">
+
+		<umb-locked-field
+			ng-model="vm.value"
+			placeholder-text="'Click to unlock...'">
+		</umb-locked-field>
+
+	</div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+	(function () {
+		"use strict";
+
+		function Controller() {
+
+			var vm = this;
+			vm.value = "My locked text";
+
+        }
+
+		angular.module("umbraco").controller("My.Controller", Controller);
+
+	})();
+</pre>
+
+@param {string} ngModel (<code>binding</code>): The locked text.
+@param {boolean=} locked (<code>binding</code>): <Code>true</code> by default. Set to <code>false</code> to unlock the text.
+@param {string=} placeholderText (<code>binding</code>): If ngModel is empty this text will be shown.
+@param {string=} regexValidation (<code>binding</code>): Set a regex expression for validation of the field.
+@param {string=} serverValidationField (<code>attribute</code>): Set a server validation field.
 **/
+
 (function() {
 	'use strict';

@@ -1,3 +1,87 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbMediaGrid
+@restrict E
+@scope
+
+@description
+Use this directive to generate a thumbnail grid of media items.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-media-grid
+           items="vm.mediaItems"
+           on-click="vm.clickItem"
+           on-click-name="vm.clickItemName">
+        </umb-media-grid>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.mediaItems = [];
+
+            vm.clickItem = clickItem;
+            vm.clickItemName = clickItemName;
+
+            myService.getMediaItems().then(function (mediaItems) {
+                vm.mediaItems = mediaItems;
+            });
+
+            function clickItem(item, $event, $index){
+                // do magic here
+            }
+
+            function clickItemName(item, $event, $index) {
+                // set item.selected = true; to select the item
+                // do magic here
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {array} items (<code>binding</code>): Array of media items.
+@param {callback=} onDetailsHover (<code>binding</code>): Callback method when the details icon is hovered.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>item</code>: The hovered item</li>
+        <li><code>$event</code>: The hover event</li>
+        <li><code>hover</code>: Boolean to tell if the item is hovered or not</li>
+    </ul>
+@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the media item.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>item</code>: The clicked item</li>
+        <li><code>$event</code>: The click event</li>
+        <li><code>$index</code>: The item index</li>
+    </ul>
+@param {callback=} onClickName (<code>binding</code>): Callback method to handle click events on the media item name.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>item</code>: The clicked item</li>
+        <li><code>$event</code>: The click event</li>
+        <li><code>$index</code>: The item index</li>
+    </ul>
+@param {string=} filterBy (<code>binding</code>): String to filter media items by
+@param {string=} itemMaxWidth (<code>attribute</code>): Sets a max width on the media item thumbnails.
+@param {string=} itemMaxHeight (<code>attribute</code>): Sets a max height on the media item thumbnails.
+@param {string=} itemMinWidth (<code>attribute</code>): Sets a min width on the media item thumbnails.
+@param {string=} itemMinHeight (<code>attribute</code>): Sets a min height on the media item thumbnails.
+
+**/
+
 (function() {
    'use strict';

@@ -34,6 +118,13 @@
                    var item = scope.items[i];
                    setItemData(item);
                    setOriginalSize(item, itemMaxHeight);
+
+                    // remove non images when onlyImages is set to true
+                    if(scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
+                        scope.items.splice(i, 1);
+                        i--;
+                    }
+
                }

                if (scope.items.length > 0) {
@@ -181,7 +272,8 @@
                itemMaxWidth: "@",
                itemMaxHeight: "@",
                itemMinWidth: "@",
-                itemMinHeight: "@"
+                itemMinHeight: "@",
+                onlyImages: "@"
            },
            link: link
        };
@@ -1,3 +1,88 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbPagination
+@restrict E
+@scope
+
+@description
+Use this directive to generate a pagination.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-pagination
+            page-number="vm.pagination.pageNumber"
+            total-pages="vm.pagination.totalPages"
+            on-next="vm.nextPage"
+            on-prev="vm.prevPage"
+            on-go-to-page="vm.goToPage">
+        </umb-pagination>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+
+            vm.pagination = {
+                pageNumber: 1,
+                totalPages: 10
+            }
+
+            vm.nextPage = nextPage;
+            vm.prevPage = prevPage;
+            vm.goToPage = goToPage;
+
+            function nextPage(pageNumber) {
+                // do magic here
+                console.log(pageNumber);
+                alert("nextpage");
+            }
+
+            function prevPage(pageNumber) {
+                // do magic here
+                console.log(pageNumber);
+                alert("prevpage");
+            }
+
+            function goToPage(pageNumber) {
+                // do magic here
+                console.log(pageNumber);
+                alert("go to");
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {number} pageNumber (<code>binding</code>): Current page number.
+@param {number} totalPages (<code>binding</code>): The total number of pages.
+@param {callback} onNext (<code>binding</code>): Callback method to go to the next page.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>pageNumber</code>: The page number</li>
+    </ul>
+@param {callback=} onPrev (<code>binding</code>): Callback method to go to the previous page.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>pageNumber</code>: The page number</li>
+    </ul>
+@param {callback=} onGoToPage (<code>binding</code>): Callback method to go to a specific page.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>pageNumber</code>: The page number</li>
+    </ul>
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,41 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbStickyBar
+@restrict A
+
+@description
+Use this directive make an element sticky and follow the page when scrolling.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <div
+           class="my-sticky-bar"
+           umb-sticky-bar
+           scrollable-container=".container">
+        </div>
+
+    </div>
+</pre>
+
+<h3>CSS example</h3>
+<pre>
+    .my-sticky-bar {
+        padding: 15px 0;
+        background: #000000;
+        position: relative;
+        top: 0;
+    }
+
+    .my-sticky-bar.-umb-sticky-bar {
+        top: 100px;
+    }
+</pre>
+
+@param {string} scrollableContainer Set the class (".element") or the id ("#element") of the scrollable container element.
+**/
+
 (function() {
   'use strict';

@@ -1,3 +1,71 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTooltip
+@restrict E
+@scope
+
+@description
+Use this directive to render a tooltip.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <div
+            ng-mouseover="vm.mouseOver($event)"
+            ng-mouseleave="vm.mouseLeave()">
+            Hover me
+        </div>
+
+        <umb-tooltip
+           ng-if="vm.tooltip.show"
+           event="vm.tooltip.event">
+           // tooltip content here
+        </umb-tooltip>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller() {
+
+            var vm = this;
+            vm.tooltip = {
+                show: false,
+                event: null
+            };
+
+            vm.mouseOver = mouseOver;
+            vm.mouseLeave = mouseLeave;
+
+            function mouseOver($event) {
+                vm.tooltip = {
+                    show: true,
+                    event: $event
+                };
+            }
+
+            function mouseLeave() {
+                vm.tooltip = {
+                    show: false,
+                    event: null
+                };
+            }
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+
+    })();
+</pre>
+
+@param {string} event Set the $event from the target element to position the tooltip relative to the mouse cursor.
+**/
+
 (function() {
   'use strict';

@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbContentName
+* @name umbraco.directives.directive:umbFileDropzone
 * @restrict E
 * @function
 * @description
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbFileUpload
+* @name umbraco.directives.directive:umbSingleFileUpload
 * @function
 * @restrict A
 * @scope
@@ -282,7 +282,7 @@ function keyboardService($window, $timeout) {
        keyboardManagerService.keyboardEvent[label] = {
            'callback': callback,
            'target':   elt,
-            'opt':      opt['type']
+            'opt':      opt
        };

        if (!found) {
@@ -1,3 +1,47 @@
+/**
+ @ngdoc service
+ * @name umbraco.services.listViewHelper
+ *
+ *
+ * @description
+ * Service for performing operations against items in the list view UI. Used by the built-in internal listviews
+ * as well as custom listview.
+ *
+ * A custom listview is always used inside a wrapper listview, so there are a number of inherited values on its
+ * scope by default:
+ *
+ * **$scope.selection**: Array containing all items currently selected in the listview
+ *
+ * **$scope.items**: Array containing all items currently displayed in the listview
+ *
+ * **$scope.folders**: Array containing all folders in the current listview (only for media)
+ *
+ * **$scope.options**: configuration object containing information such as pagesize, permissions, order direction etc.
+ *
+ * **$scope.model.config.layouts**: array of available layouts to apply to the listview (grid, list or custom layout)
+ *
+ * ##Usage##
+ * To use, inject listViewHelper into custom listview controller, listviewhelper expects you
+ * to pass in the full collection of items in the listview in several of its methods
+ * this collection is inherited from the parent controller and is available on $scope.selection
+ *
+ * <pre>
+ *      angular.module("umbraco").controller("my.listVieweditor". function($scope, listViewHelper){
+ *
+ *          //current items in the listview
+ *          var items = $scope.items;
+ *
+ *          //current selection
+ *          var selection = $scope.selection;
+ *
+ *          //deselect an item , $scope.selection is inherited, item is picked from inherited $scope.items
+ *          listViewHelper.deselectItem(item, $scope.selection);
+ *
+ *          //test if all items are selected, $scope.items + $scope.selection are inherited
+ *          listViewhelper.isSelectedAll($scope.items, $scope.selection);
+ *      });
+ * </pre>
+ */
 (function () {
    'use strict';

@@ -6,6 +50,19 @@
        var firstSelectedIndex = 0;
        var localStorageKey = "umblistViewLayout";

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#getLayout
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Method for internal use, based on the collection of layouts passed, the method selects either
+        * any previous layout from local storage, or picks the first allowed layout
+        *
+        * @param {Number} nodeId The id of the current node displayed in the content editor
+        * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
+        */
+
        function getLayout(nodeId, availableLayouts) {

            var storedLayouts = [];
@@ -28,6 +85,19 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#setLayout
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Changes the current layout used by the listview to the layout passed in. Stores selection in localstorage
+        *
+        * @param {Number} nodeID Id of the current node displayed in the content editor
+        * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
+        * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
+        */
+
        function setLayout(nodeId, selectedLayout, availableLayouts) {

            var activeLayout = {};
@@ -54,6 +124,18 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#saveLayoutInLocalStorage
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Stores a given layout as the current default selection in local storage
+        *
+        * @param {Number} nodeId Id of the current node displayed in the content editor
+        * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
+        */
+
        function saveLayoutInLocalStorage(nodeId, selectedLayout) {
            var layoutFound = false;
            var storedLayouts = [];
@@ -84,6 +166,17 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#getFirstAllowedLayout
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Returns currently selected layout, or alternatively the first layout in the available layouts collection
+        *
+        * @param {Array} layouts Array of all allowed layouts, available from $scope.model.config.layouts
+        */
+
        function getFirstAllowedLayout(layouts) {

            var firstAllowedLayout = {};
@@ -99,6 +192,23 @@
            return firstAllowedLayout;
        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#selectHandler
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Helper method for working with item selection via a checkbox, internally it uses selectItem and deselectItem.
+        * Working with this method, requires its triggered via a checkbox which can then pass in its triggered $event
+        * When the checkbox is clicked, this method will toggle selection of the associated item so it matches the state of the checkbox
+        *
+        * @param {Object} selectedItem Item being selected or deselected by the checkbox
+        * @param {Number} selectedIndex Index of item being selected/deselected, usually passed as $index
+        * @param {Array} items All items in the current listview, available as $scope.items
+        * @param {Array} selection All selected items in the current listview, available as $scope.selection
+        * @param {Event} $event Event triggered by the checkbox being checked to select / deselect an item
+        */
+
        function selectHandler(selectedItem, selectedIndex, items, selection, $event) {

            var start = 0;
@@ -143,6 +253,18 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#selectItem
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Selects a given item to the listview selection array, requires you pass in the inherited $scope.selection collection
+        *
+        * @param {Object} item Item to select
+        * @param {Array} selection Listview selection, available as $scope.selection
+        */
+
        function selectItem(item, selection) {
            var isSelected = false;
            for (var i = 0; selection.length > i; i++) {
@@ -157,6 +279,18 @@
            }
        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#deselectItem
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Deselects a given item from the listviews selection array, requires you pass in the inherited $scope.selection collection
+        *
+        * @param {Object} item Item to deselect
+        * @param {Array} selection Listview selection, available as $scope.selection
+        */
+
        function deselectItem(item, selection) {
            for (var i = 0; selection.length > i; i++) {
                var selectedItem = selection[i];
@@ -167,6 +301,20 @@
            }
        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#clearSelection
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Removes a given number of items and folders from the listviews selection array
+        * Folders can only be passed in if the listview is used in the media section which has a concept of folders.
+        *
+        * @param {Array} items Items to remove, can be null
+        * @param {Array} folders Folders to remove, can be null
+        * @param {Array} selection Listview selection, available as $scope.selection
+        */
+
        function clearSelection(items, folders, selection) {

            var i = 0;
@@ -180,7 +328,7 @@
                }
            }

-            if (angular.isArray(items)) {
+         if(angular.isArray(folders)) {
                for (i = 0; folders.length > i; i++) {
                    var folder = folders[i];
                    folder.selected = false;
@@ -188,6 +336,20 @@
            }
        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#selectAllItems
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Helper method for toggling the select state on all items in the active listview
+        * Can only be used from a checkbox as a checkbox $event is required to pass in.
+        *
+        * @param {Array} items Items to toggle selection on, should be $scope.items
+        * @param {Array} selection Listview selection, available as $scope.selection
+        * @param {$event} $event Event passed from the checkbox being toggled
+        */
+
        function selectAllItems(items, selection, $event) {

            var checkbox = $event.target;
@@ -219,6 +381,20 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#isSelectedAll
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Method to determine if all items on the current page in the list has been selected
+        * Given the current items in the view, and the current selection, it will return true/false
+        *
+        * @param {Array} items Items to test if all are selected, should be $scope.items
+        * @param {Array} selection Listview selection, available as $scope.selection
+        * @returns {Boolean} boolean indicate if all items in the listview have been selected
+        */
+
        function isSelectedAll(items, selection) {

            var numberOfSelectedItem = 0;
@@ -242,10 +418,35 @@

        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#setSortingDirection
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * *Internal* method for changing sort order icon
+        * @param {String} col Column alias to order after
+        * @param {String} direction Order direction `asc` or `desc`
+        * @param {Object} options object passed from the parent listview available as $scope.options
+        */
+
        function setSortingDirection(col, direction, options) {
            return options.orderBy.toUpperCase() === col.toUpperCase() && options.orderDirection === direction;
        }

+        /**
+        * @ngdoc method
+        * @name umbraco.services.listViewHelper#setSorting
+        * @methodOf umbraco.services.listViewHelper
+        *
+        * @description
+        * Method for setting the field on which the listview will order its items after.
+        *
+        * @param {String} field Field alias to order after
+        * @param {Boolean} allow Determines if the user is allowed to set this field, normally true
+        * @param {Object} options Options object passed from the parent listview available as $scope.options
+        */
+
        function setSorting(field, allow, options) {
            if (allow) {
                options.orderBy = field;
@@ -257,12 +458,12 @@
                }
            }
        }
-        
+
        //This takes in a dictionary of Ids with Permissions and determines
        // the intersect of all permissions to return an object representing the
        // listview button permissions
        function getButtonPermissions(unmergedPermissions, currentIdsWithPermissions) {
-            
+
            if (currentIdsWithPermissions == null) {
                currentIdsWithPermissions = {};
            }
@@ -286,26 +487,28 @@
                canCopy: _.contains(intersectPermissions, 'O'), //Magic Char = O
                canCreate: _.contains(intersectPermissions, 'C'), //Magic Char = C
                canDelete: _.contains(intersectPermissions, 'D'), //Magic Char = D
-                canMove: _.contains(intersectPermissions, 'M'), //Magic Char = M                
+                canMove: _.contains(intersectPermissions, 'M'), //Magic Char = M
                canPublish: _.contains(intersectPermissions, 'U'), //Magic Char = U
-                canUnpublish: _.contains(intersectPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)                        
+                canUnpublish: _.contains(intersectPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
            };
        }

        var service = {
-            getLayout: getLayout,
-            getFirstAllowedLayout: getFirstAllowedLayout,
-            setLayout: setLayout,
-            saveLayoutInLocalStorage: saveLayoutInLocalStorage,
-            selectHandler: selectHandler,
-            selectItem: selectItem,
-            deselectItem: deselectItem,
-            clearSelection: clearSelection,
-            selectAllItems: selectAllItems,
-            isSelectedAll: isSelectedAll,
-            setSortingDirection: setSortingDirection,
-            setSorting: setSorting,
-            getButtonPermissions: getButtonPermissions
+
+          getLayout: getLayout,
+          getFirstAllowedLayout: getFirstAllowedLayout,
+          setLayout: setLayout,
+          saveLayoutInLocalStorage: saveLayoutInLocalStorage,
+          selectHandler: selectHandler,
+          selectItem: selectItem,
+          deselectItem: deselectItem,
+          clearSelection: clearSelection,
+          selectAllItems: selectAllItems,
+          isSelectedAll: isSelectedAll,
+          setSortingDirection: setSortingDirection,
+          setSorting: setSorting,
+          getButtonPermissions: getButtonPermissions
+
        };

        return service;
@@ -26,7 +26,9 @@
   justify-content: center;
 }

-.umb-content-grid__icon {
+.umb-content-grid__icon,
+.umb-content-grid__icon[class^="icon-"],
+.umb-content-grid__icon[class*=" icon-"] {
   font-size: 40px;
   color: lighten(@gray, 20%);
 }
@@ -37,7 +37,9 @@
   align-items: center;
 }

-.umb-folder-grid__folder-icon {
+.umb-folder-grid__folder-icon,
+.umb-folder-grid__folder-icon[class^="icon-"],
+.umb-folder-grid__folder-icon[class*=" icon-"] {
   font-size: 20px;
   margin-right: 15px;
   color: @black;
@@ -51,7 +51,9 @@
   border: 1px solid @blue;
 }

-.umb-layout-selector__dropdown-item-icon {
+.umb-layout-selector__dropdown-item-icon,
+.umb-layout-selector__dropdown-item-icon[class^="icon-"],
+.umb-layout-selector__dropdown-item-icon[class*=" icon-"] {
   font-size: 20px;
   color: @gray;
   text-align: center;
@@ -85,7 +85,7 @@ input.umb-table__input {
 .umb-table-body .umb-table-row {
    color: fade(@gray, 75%);
    border-top: 1px solid @grayLight;
-
+    cursor: pointer;
    font-size: 13px;

    &:hover {
@@ -101,16 +101,21 @@ input.umb-table__input {
    }
 }

-.umb-table-body__icon {
+.umb-table-body__icon,
+.umb-table-body__icon[class^="icon-"],
+.umb-table-body__icon[class*=" icon-"] {
    margin: 0 auto;
-
    font-size: 22px;
+    line-height: 22px;
    color: @blueDark;
 }

-.umb-table-body__checkicon {
+.umb-table-body__checkicon,
+.umb-table-body__checkicon[class^="icon-"],
+.umb-table-body__checkicon[class*=" icon-"] {
    display: none;
    font-size: 16px;
+    line-height: 22px;
 }

 .umb-table-body .umb-table__name {
@@ -205,8 +210,6 @@ input.umb-table__input {
    overflow: hidden;
    white-space: nowrap; //NOTE Disable/Enable this to keep textstring on one line
    text-overflow: ellipsis;
-
-    cursor: default;
 }

 .umb-table-cell:first-of-type {
@@ -243,7 +243,8 @@
  background-color: @grayLighter
 }

-.table-striped tbody i:hover {
+/* don't hide all icons, e.g. for a sortable handle */
+.umb-listview .table-striped tbody i:not(.handle):hover {
  display: none !important
 }

@@ -714,7 +714,45 @@ ul.color-picker li a  {
 }

 //
-// tags
+// Related links
+// --------------------------------------------------
+.umb-relatedlinks table > tr > td { word-wrap:break-word; word-break: break-all; border-bottom: 1px solid transparent; }
+.umb-relatedlinks .handle { cursor:move; }
+.umb-relatedlinks table > tbody > tr.unsortable .handle { cursor:default; }
+
+.umb-relatedlinks table td.col-sort { width: 20px; }
+.umb-relatedlinks table td.col-caption { min-width: 200px; }
+.umb-relatedlinks table td.col-link { min-width: 200px;  }
+.umb-relatedlinks table td.col-actions { min-width: 120px; }
+
+.umb-relatedlinks table td.col-caption .control-wrapper,
+.umb-relatedlinks table td.col-link .control-wrapper { display: flex; }
+
+.umb-relatedlinks table td.col-caption .control-wrapper input[type="text"],
+.umb-relatedlinks table td.col-link .control-wrapper input[type="text"] { width: auto; flex: 1; }
+
+/* sortable placeholder */
+.umb-relatedlinks .sortable-placeholder {
+    background-color: @tableBackgroundAccent;
+    display: table-row;
+}
+.umb-relatedlinks .sortable-placeholder > td {
+    display: table-cell;
+    padding: 8px;
+}
+.umb-relatedlinks .ui-sortable-helper {
+    display: table-row;
+    background-color: @white;
+    opacity: 0.7;
+}
+.umb-relatedlinks .ui-sortable-helper > td {
+    display: table-cell;
+    border-bottom: 1px solid @tableBorder;
+}
+
+
+//
+// Tags
 // --------------------------------------------------
 .umb-tags{border: @grayLighter solid 1px; padding: 10px; font-size: 13px; text-shadow: none;}
 .umb-tags .tag{cursor: pointer;  margin: 7px; padding: 7px; background: @blue}
@@ -418,9 +418,9 @@ div.locked:before{
 	padding-left: 10px;
 }
 .umb-actions-child li .menu-label {
-	font-size: 12px;
+	font-size: 14px;
 	color: #000;
-	margin-left: 20px;
+	margin-left: 10px;
 }

 .umb-actions-child li .menu-label small {
@@ -436,6 +436,9 @@ div.locked:before{
 }
 .umb-actions-child i {
 	font-size: 32px;
+    min-width: 32px;
+    text-align: center;
+    line-height: 24px; /* set line-height to ensure all icons use same line-height */
 }

 .umb-actions-child li.add {
@@ -32,7 +32,7 @@
        <li class="umb-checkbox-list__item"

            ng-repeat="compositeContentType in model.availableCompositeContentTypes | filter:searchTerm"
-            ng-class="{'-disabled': compositeContentType.allowed===false, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
+            ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">

            <div class="umb-checkbox-list__item-checkbox"
                 ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
@@ -41,7 +41,7 @@
                       checklist-model="model.compositeContentTypes"
                       checklist-value="compositeContentType.contentType.alias"
                       ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
-                       ng-disabled="compositeContentType.allowed===false"/>
+                       ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited"/>
            </div>

            <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
@@ -16,7 +16,12 @@ angular.module("umbraco")
            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
            $scope.cropSize = dialogOptions.cropSize;
            $scope.lastOpenedNode = $cookieStore.get("umbLastOpenedMediaNodeId");
-            $scope.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+            if($scope.onlyImages){
+                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+            }
+            else {
+                $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
+            }
            $scope.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";

            $scope.model.selectedImages = [];
@@ -80,7 +80,8 @@
         item-max-width="150"
         item-max-height="150"
         item-min-width="100"
-         item-min-height="100">
+         item-min-height="100"
+         only-images={{onlyImages}}>
      </umb-media-grid>

   </div>
@@ -10,4 +10,16 @@ angular.module("umbraco")
            $scope.model.error.data.StackTrace = $scope.model.error.data.StackTrace.trim();
        }

+        if ($scope.model.error && $scope.model.error.data) {
+            $scope.model.error.data.InnerExceptions = [];
+            var ex = $scope.model.error.data.InnerException;
+            while (ex) {
+                if (ex.StackTrace) {
+                    ex.StackTrace = ex.StackTrace.trim();
+                }
+                $scope.model.error.data.InnerExceptions.push(ex);
+                ex = ex.InnerException;
+            }
+        }
+
    });
@@ -16,4 +16,12 @@
        </h5>
        <pre style="white-space: pre-wrap; overflow-x: auto;">{{model.error.data.StackTrace}}</pre>
    </div>
+
+    <div class="umb-control-group" ng-repeat="e in model.error.data.InnerExceptions">
+        <h5>
+            <localize key="defaultdialogs_innerException">Inner Exception:</localize>
+        </h5>
+        <div>{{e.ExceptionType}}: {{e.ExceptionMessage}}</div>
+        <pre style="white-space: pre-wrap; overflow-x: auto;">{{e.StackTrace}}</pre>
+    </div>
 </div>
@@ -1,4 +1,4 @@
-<div class="umb-panel umb-editor-wrapper animated -half-second fadeIn"
+<div class="umb-panel umb-editor-wrapper"
    ng-class="{
        '-no-footer': footer === 'false'
    }"
@@ -9,7 +9,7 @@
      <i ng-if="item.selected" class="icon-check umb-content-grid__checkmark"></i>

      <div class="umb-content-grid__icon-container">
-         <i class="{{ item.icon }} umb-content-grid__icon" ng-class="{'-light': !item.published}"></i>
+          <i class="umb-content-grid__icon {{ item.icon }}" ng-class="{'-light': !item.published}"></i>
      </div>

      <div class="umb-content-grid__content">
@@ -107,7 +107,7 @@

                <ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="tab.properties">

-                    <li ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited && !property.locked}" ng-repeat="property in tab.properties">
+                    <li ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}" ng-repeat="property in tab.properties">

                        <!-- Init property / Property placeholder / add new property -->
                        <a href=""
@@ -138,7 +138,7 @@

                        </a>

-                        <div class="umb-group-builder__property" ng-if="property.propertyState!=='init'" ng-class="{'-active': property.dialogIsOpen, '-active': property.propertyState=='active', '-inherited': property.inherited, '-locked': property.locked, 'umb-group-builder__property-handle -sortable': sortingMode && !property.inherited && !property.locked, '-sortable-locked': sortingMode && (property.inherited || property.locked)}">
+                        <div class="umb-group-builder__property" ng-if="property.propertyState!=='init'" ng-class="{'-active': property.dialogIsOpen, '-active': property.propertyState=='active', '-inherited': property.inherited, '-locked': property.locked, 'umb-group-builder__property-handle -sortable': sortingMode && !property.inherited, '-sortable-locked': sortingMode && property.inherited}">

                            <!-- property meta text -->
                            <div class="umb-group-builder__property-meta" ng-class="{'-full-width': sortingMode}">
@@ -184,7 +184,7 @@
                                </ng-form>

                                <div ng-if="sortingMode">
-                                    <i class="icon icon-navigation" ng-if="!property.inherited && !property.locked"></i>
+                                    <i class="icon icon-navigation" ng-if="!property.inherited"></i>
                                    <span class="umb-group-builder__property-meta-label">{{ property.label }}</span>
                                    <span class="umb-group-builder__property-meta-alias">({{ property.alias }})</span>
                                </div>
@@ -5,10 +5,9 @@
   </div>

   <div ng-if="layoutDropDownIsOpen" class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn" on-outside-click="closeLayoutDropdown()">
-
-      <div ng-repeat="layout in layouts | filter:{selected:true}" class="umb-layout-selector__dropdown-item" ng-click="pickLayout(layout)" ng-class="{'-active': layout.active }">
-         <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
-      </div>
+       <div ng-repeat="layout in layouts | filter:{selected:true}" class="umb-layout-selector__dropdown-item" ng-click="pickLayout(layout)" ng-class="{'-active': layout.active }" ng-attr-title="{{layout.name}}">
+           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
+       </div>

   </div>

@@ -78,12 +78,12 @@
               <strong>{{ file.name }}</strong>

               <span class="file-error" ng-if="file.$error">
-                  <span ng-if="file.$error === 'pattern'" class="errorMessage color-red">(<localize key="media_onlyAllowedFiles"></localize>: "{{ accept }}")</span>
-                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(<localize key="media_maxFileSize"></localize> "{{maxFileSize}}")</span>
+                  <span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType"></localize></span>
+                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize"></localize> "{{maxFileSize}}"</span>
               </span>

               <span class="file-error" ng-if="file.serverErrorMessage">
-                   <span class="errorMessage color-red">({{file.serverErrorMessage}})</span>
+                   <span class="errorMessage color-red">{{file.serverErrorMessage}}</span>
               </span>

            </div>
@@ -166,17 +166,17 @@

                            <div class="row form-search">
                                <div class="span8 input-append">
-                                    <input type="text" class="search-query" ng-model="searcher.searchText" />
+                                    <input type="text" class="search-query" ng-model="searcher.searchText" no-dirty-check />
                                    <button type="submit" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
                                </div>
                            </div>
                            <div class="row">
                                <label for="{{searcher.name}}-textSearch" class="radio inline">
-                                    <input type="radio" name="searchType" id="{{searcher.name}}-textSearch" value="text" ng-model="searcher.searchType" />
+                                    <input type="radio" name="searchType" id="{{searcher.name}}-textSearch" value="text" ng-model="searcher.searchType" no-dirty-check />
                                    Text Search
                                </label>
                                <label for="{{searcher.name}}-luceneSearch" class="radio inline">
-                                    <input type="radio" name="searchType" id="{{searcher.name}}-luceneSearch" value="lucene" ng-model="searcher.searchType" />
+                                    <input type="radio" name="searchType" id="{{searcher.name}}-luceneSearch" value="lucene" ng-model="searcher.searchType" no-dirty-check />
                                    Lucene Search
                                </label>
                            </div>
@@ -1,13 +1,13 @@
 <h3>Start here</h3>
 <h4>This section contains the building blocks for your Umbraco site</h4>
-<p>Follow the below links to find out more about working with the items in the Setings section:</p>
+<p>Follow the below links to find out more about working with the items in the Settings section:</p>

 <h4>Find out more:</h4>

 <ul>
-<li>Read more about working with the Items in Settings <a class="btn-link -underline" href="http://our.umbraco.org/wiki/umbraco-help/settings" target="_blank">in the Community Wiki</a></li>
-<li>Download the <a class="btn-link -underline" href="http://our.umbraco.org/projects/website-utilities/umbraco-7-editors-manual" target="_blank">Editors Manual</a> for details on working with the Umbraco UI</li>
-<li>Ask a question in the <a class="btn-link -underline" href="http://our.umbraco.org/" target="_blank">Community Forum</a></li>
+<li>Read more about working with the Items in Settings <a class="btn-link -underline" href="https://our.umbraco.org/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco</li>
+<li>Download the <a class="btn-link -underline" href="https://our.umbraco.org/projects/website-utilities/umbraco-7-editors-manual" target="_blank">Editors Manual</a> for details on working with the Umbraco UI</li>
+<li>Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.org/" target="_blank">Community Forum</a></li>
 <li>Watch our <a class="btn-link -underline" href="http://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)</li>
 <li>Find out about our <a class="btn-link -underline" href="http://umbraco.com/products" target="_blank">productivity boosting tools and commercial support</a></li>
 <li>Find out about real-life <a class="btn-link -underline" href="http://umbraco.com/products/training/schedule" target="_blank">training and certification</a> opportunities</li>
@@ -145,7 +145,8 @@

                            contentTypeHelper.generateModels().then(function (result) {

-                                if (result.success) {
+                                // generateModels() returns the dashboard content
+                                if (!result.lastError) {

                                    //re-check model status
                                    contentTypeHelper.checkModelsBuilderStatus().then(function(statusResult) {
@@ -14,10 +14,8 @@
      var vm = this;

      vm.nodeId = $scope.contentId;
-       //vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
-        //instead of passing in a whitelist, we pass in a blacklist by adding ! to the ext
-      vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/./g, "!.");
-
+      //we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+      vm.acceptedFileTypes = !mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
      vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
      vm.activeDrag = false;
      vm.mediaDetailsTooltip = {};
@@ -6,9 +6,8 @@
        var vm = this;

        vm.nodeId = $scope.contentId;
-        //vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
-        //instead of passing in a whitelist, we pass in a blacklist by adding ! to the ext
-        vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/./g, "!.");
+        //we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+        vm.acceptedFileTypes = !mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
        vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
        vm.activeDrag = false;
        vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
@@ -59,6 +59,25 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
        items: []
    };
    
+    $scope.currentNodePermissions = {}
+
+    //Just ensure we do have an editorState
+    if (editorState.current) {
+        //Fetch current node allowed actions for the current user
+        //This is the current node & not each individual child node in the list
+        var currentUserPermissions = editorState.current.allowedActions;
+
+        //Create a nicer model rather than the funky & hard to remember permissions strings
+        $scope.currentNodePermissions = {
+            "canCopy": _.contains(currentUserPermissions, 'O'), //Magic Char = O
+            "canCreate": _.contains(currentUserPermissions, 'C'), //Magic Char = C
+            "canDelete": _.contains(currentUserPermissions, 'D'), //Magic Char = D
+            "canMove": _.contains(currentUserPermissions, 'M'), //Magic Char = M                
+            "canPublish": _.contains(currentUserPermissions, 'U'), //Magic Char = U
+            "canUnpublish": _.contains(currentUserPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
+        };
+    }
+
    //when this is null, we don't check permissions
    $scope.buttonPermissions = null;

@@ -12,10 +12,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                $scope.model.config.startNodeId = userData.startMediaId;
            });
        }
-         
+
        function setupViewModel() {
            $scope.images = [];
-            $scope.ids = []; 
+            $scope.ids = [];

            if ($scope.model.value) {
                var ids = $scope.model.value.split(',');
@@ -30,16 +30,16 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                entityResource.getByIds(ids, "Media").then(function (medias) {

                    _.each(medias, function (media, i) {
-                        
+
                        //only show non-trashed items
                        if (media.parentId >= -1) {

-                            if (!media.thumbnail) { 
+                            if (!media.thumbnail) {
                                media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
                            }

                            $scope.images.push(media);
-                            $scope.ids.push(media.id);   
+                            $scope.ids.push(media.id);
                        }
                    });

@@ -67,6 +67,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
               title: "Select media",
               startNodeId: $scope.model.config.startNodeId,
               multiPicker: multiPicker,
+               onlyImages: onlyImages,
               show: true,
               submit: function(model) {

@@ -93,8 +94,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
       $scope.sortableOptions = {
           update: function(e, ui) {
               var r = [];
-               //TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the 
-               // content picker. THen we don't have to worry about setting ids, render models, models, we just set one and let the 
+               //TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
+               // content picker. THen we don't have to worry about setting ids, render models, models, we just set one and let the
               // watch do all the rest.
                $timeout(function(){
                    angular.forEach($scope.images, function(value, key){
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Per Ploug	fcaa4ad8d6	JsDocs comments on listviewhelper (U4-7185)	2016-04-14 11:36:24 +02:00
Sebastiaan Janssen	bf70e208ad	U4-8325 XSLT macro rendering logs too much in Info mode (after upgrade 7.1.4 => 7.4.0)	2016-04-14 09:34:53 +02:00
Shannon Deminick	26f705b129	Merge pull request #1224 from 0xc0dec/dev-v7 Fixed logger context class	2016-04-13 20:18:21 +02:00
Aleksey Fedotov	9e3941e8e1	Fixed logger context class	2016-04-13 22:14:21 +05:00
Stephan	7886b7814d	U4-8312 - models generation false error (#1222 )	2016-04-13 15:57:27 +02:00
Claus	cf7756a96d	Merge pull request #1217 from umbraco/temp-U4-8298 Fixes: U4-8298 CacheRefresher authorization logic reversed - traditio…	2016-04-12 13:19:59 +02:00
Claus	20347c1ccd	Fixing typo.	2016-04-12 13:17:41 +02:00
Shannon	36255709e6	U4-8297 Custom MembershipProvider search doesn't work in the listview	2016-04-07 18:16:03 +02:00
Shannon	506ed9f866	U4-8286 Add OWIN startup events to the UmbracoDefaultOwinStartup class	2016-04-07 17:51:09 +02:00
Shannon	f87bec398d	U4-8239 DisableBrowserCacheAttribute causing YSOD when a previous exceptions is thrown before the filter kicks in	2016-04-07 16:44:45 +02:00
Shannon	1e5b6a6a0f	Fixes: U4-8298 CacheRefresher authorization logic reversed - traditional load balancing will not work	2016-04-07 15:42:51 +02:00
Warren Buckley	a2f8e92098	Merge pull request #1087 from bjarnef/dev-v7-U4-6425 U4-6425 - Maximum property for Related Links	2016-04-07 08:47:01 +01:00
bjarnef	9d5af4ad5e	Merge branch 'dev-v7' of git://github.com/umbraco/Umbraco-CMS into dev-v7-U4-6425 Conflicts: src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html	2016-04-06 20:20:22 +02:00
bjarnef	ae154885e4	Ensure icon has a value.	2016-04-06 19:52:21 +02:00
bjarnef	2c29e422bc	Add icons for internal links.	2016-04-06 19:47:05 +02:00
bjarnef	2d6b8712d5	Limit this to listview, so it doesn't affect other property editors.	2016-04-06 19:44:09 +02:00
Warren Buckley	81aad6fc64	Merge pull request #1205 from bjarnef/dev-v7-U4-8248 U4-8248 - Add tooltip for listview layout + cursor style for listview table row	2016-04-06 15:45:31 +01:00
Claus	58280e7d63	Merge pull request #1209 from greystate/fix-U4-8260 Fix for U4-8260	2016-04-06 11:12:43 +02:00
Sebastiaan Janssen	c856795cb7	Fix hilariously wrong copy/pasted TODO comments..	2016-04-05 08:03:47 +02:00
madden-tom	2d514ac09e	Added check for publish permissions to remove option for Publish At a… U4-287 "Publish at" circumvents "Send for approval/publishing"	2016-04-05 08:01:05 +02:00
Sebastiaan Janssen	8e8b8bdea1	Revert "Removes old obsoleted ping.aspx" This reverts commit `453efc02a5`. Conflicts: src/Umbraco.Web.UI/Umbraco.Web.UI.csproj U4-8274 '/umbraco/ping.aspx' is missing	2016-04-04 09:20:59 +02:00
Sebastiaan Janssen	d8c781f97f	Make the file exclusion filter more readable	2016-04-03 13:39:05 +02:00
Sebastiaan Janssen	6502470708	U4-8265 Listview list and listview grid does not handle acceptedFileTypes in same way	2016-04-03 12:08:25 +02:00
Sebastiaan Janssen	680396daab	Localize server-side error message for disallowed file uploads	2016-04-03 12:08:23 +02:00
Asbjørn Riis-Knudsen	4e4ea59433	* Only restrict to image files when onlyImages is active* Handle disallowed filetypes as per other upload controls * Only restrict to image files when onlyImages is active * Handle disallowed filetypes as per other upload controls	2016-04-02 19:07:35 +02:00
bjarnef	40f7e87e04	Fix issues when using custom font icons in backoffice.	2016-04-02 13:36:55 +02:00
Warren Buckley	fbce20d0c3	Merge pull request #1158 from umbraco/temp-U4-8016 Fixes: U4-8016 Pick only images from media	2016-04-01 13:54:37 +01:00
Shannon Deminick	982fa26b7e	Merge pull request #1210 from umbraco/temp-U4-8103 U4-8103	2016-03-31 18:26:09 +02:00
Stephan	c3055ca43f	U4-8103 - fix DisableBrowserCacheAttribute to handle exceptions	2016-03-31 16:37:16 +02:00
Stephan	4cca364511	U4-8103 - refactor YSOD overlay to display inner exceptions	2016-03-31 16:36:36 +02:00
Stephan	9e0ed94d77	Fix typo in lang xml files	2016-03-31 12:56:24 +02:00
Warren Buckley	374147a1a0	Merge pull request #1208 from umbraco/temp-U4-2954 U4-2954 - refresh domain cache when emptying recycle bin	2016-03-31 10:28:31 +01:00
Chriztian Steinmeier	5f0fe69c82	Update links to https	2016-03-30 21:11:29 +02:00
Chriztian Steinmeier	e325e06efc	Update link to Our on Backoffice sections	2016-03-30 21:10:41 +02:00
Chriztian Steinmeier	5e7db1047b	Add the missing 't' ⚡	2016-03-30 21:09:14 +02:00
Stephan	61fe0a4a93	U4-2954 - refresh domain cache when emptying recycle bin	2016-03-30 17:56:34 +02:00
Warren Buckley	aa1aabef3a	Merge pull request #1204 from umbraco/temp-U4-7862 U4-7862 Brackets cause issues in the stylesheet editor	2016-03-30 16:11:15 +01:00
bjarnef	d1c865480f	Add tooltip for listview layout + cursor style for listview table row.	2016-03-29 23:22:42 +02:00
Claus	c427c51053	U4-7862 Brackets cause issues in the stylesheet editor	2016-03-29 14:29:27 +02:00
paulsterling	08070e319a	Update number of sites running	2016-03-28 16:46:31 -07:00
Warren Buckley	ac2ebc4071	Merge pull request #1193 from umbraco/temp-U4-8220 U4-8220 ModelState and ViewData is not carried through when using the…	2016-03-23 12:10:05 +00:00
Shannon	d4c79a0915	Fixes tests, adds more asserts	2016-03-23 11:02:27 +01:00
Shannon	61f9845db0	bumps version	2016-03-23 10:06:53 +01:00
Shannon	43e23829ae	updates EnsurePartialViewMacroViewContextFilterAttribute to check for child actions	2016-03-23 10:06:13 +01:00
Stephan	5774ce68c7	GitIgnore Umbraco.Tests/media	2016-03-22 14:37:22 +01:00
Shannon	b9af6f631a	U4-8220 ModelState and ViewData is not carried through when using the obsolete Content.GetGridHtml method	2016-03-22 11:23:09 +01:00
Shannon	cd401f5e37	U4-8216 Hijacked controller actions fail with custom RenderModel subclass due to ModelBinding error	2016-03-21 16:12:34 +01:00
Sebastiaan Janssen	75c2b07ad3	Update ModelsBuilder dependency for the NuGet package	2016-03-18 16:32:05 +01:00
Sebastiaan Janssen	969fe30f6e	Merge pull request #1186 from umbraco/temp-U4-8043 U4-8043 - reboot app when PureLive models go wrong	2016-03-18 16:26:52 +01:00
Stephan	0f90d357cf	U4-8043 - reboot application when PureLive models go wrong	2016-03-18 16:14:06 +01:00
Stephan	d955daab0f	Upgrade ModelsBuilder to 3.0.2	2016-03-18 16:13:19 +01:00
Shannon	617b17ca9e	puts back in the current node permission check - since we use this for Create	2016-03-18 15:43:14 +01:00
Shannon	9e3d7a1cce	updates default pipeline marker stage for the preview middleware, updates MembershipHelper to not throw an exception if the Role manager is disabled.	2016-03-18 11:05:39 +01:00
Warren Buckley	f04071d7c7	Merge pull request #1180 from umbraco/temp-U4-8165 U4-8165 Ensure browsers are not caching service requests	2016-03-18 09:53:12 +00:00
Shannon Deminick	2cce9395da	Merge pull request #1181 from mittonp/dev-v7 French translations for Grid.	2016-03-18 10:15:50 +01:00
Mitton	6ad56863d4	Grid translation - French	2016-03-18 06:15:37 +02:00
Mitton	2703fa7ea2	Grid translation - French	2016-03-18 06:12:44 +02:00
Shannon	b3c6654d41	bumps version	2016-03-17 17:31:36 +01:00
Shannon	0071651621	fixes keyboard shortcut after refactor	2016-03-17 16:36:13 +01:00
Shannon Deminick	4dbc27f1fe	Merge pull request #1178 from bjarnef/dev-U4-8163 U4-8163 - Don't set dirty on form for examine dashboard search	2016-03-17 11:31:36 +01:00
Shannon	3f8bbc2f02	Merge branch 'pynej-view-save-restore-cursor' into dev-v7	2016-03-17 11:29:29 +01:00
Shannon	999be9c578	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
Claus	b36b1693dd	Fixes broken regex.	2016-03-17 10:33:04 +01:00
Simon Busborg	99b2192ab7	Fixes U4-8181 It is not possible to scroll in an overlay in Chrome 49 on a Retina Mac By removing animated -half-second fadeIn it resolves the issue where it's not possible to scroll in dialogs on a retina screen ¯\_(ツ)_/¯	2016-03-17 09:58:57 +01:00
Shannon	5230f55f44	moves attribute	2016-03-16 14:52:40 +01:00
Shannon	f93fee28dd	U4-8165 Ensure browsers are not caching service requests	2016-03-16 14:51:04 +01:00
Shannon Deminick	fc7cfea4ad	Merge pull request #1179 from umbraco/temp-U4-8175 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies	2016-03-16 14:18:03 +01:00
Stephan	bc5f651c64	U4-8154 - bugfix test	2016-03-16 13:46:51 +01:00
Stephan	ecdca378c6	U4-8175 - fix PropertyType.PropertyGroupId inconsistencies	2016-03-16 13:41:58 +01:00
Stephan	4628c1f858	U4-8154 - bugfix test	2016-03-16 13:16:56 +01:00
Shannon Deminick	5af4d02f44	Merge pull request #1177 from umbraco/temp-U4-7109 U4-7109 - could not change language in Culture and Hostnames	2016-03-16 10:48:35 +01:00
Shannon	2f9b526465	Only apply preview auth if Umbraco is fully configured	2016-03-16 10:41:33 +01:00
Stephan	800e02bccf	Bugfix model mapper for PropertyTypeDisplay	2016-03-16 10:19:06 +01:00
Shannon Deminick	693b0dba24	Merge pull request #1161 from umbraco/temp-U4-4219 U4-4219 Can't Preview protected pages	2016-03-16 10:18:06 +01:00
Stephan	2004f6a51e	U4-8154 - bugfix	2016-03-16 10:10:31 +01:00
Claus	f650b6238c	Merge branch 'arknu-U4-8026' into dev-v7	2016-03-16 07:57:59 +01:00
Claus	7c179a7868	U4-8026 Fixes up unit tests	2016-03-16 07:56:41 +01:00
bjarnef	7a7e0edfa7	Don't set dirty on form for examine dashboard search	2016-03-15 23:59:11 +01:00
bjarnef	69adec1d68	Merge branch 'dev-v7' of https://github.com/bjarnef/Umbraco-CMS into dev-v7	2016-03-15 20:23:58 +01:00
Stephan	0cf6548f86	U4-7109 - could not change language in Culture and Hostnames	2016-03-15 17:26:05 +01:00
Sebastiaan Janssen	111ee66b60	Update ModelsBuilder dependency for the NuGet package	2016-03-15 17:15:39 +01:00
Stephan	fedcd6f970	Merge pull request #1176 from umbraco/temp-U4-8168 U4-8168 Cannot re-order/move locked property types - such as the lock…	2016-03-15 16:29:57 +01:00
Stephan	8e82ff5450	Merge pull request #1173 from umbraco/temp-U4-8012 U4-8012 Generic properties tab disappears on the edit Member Type win…	2016-03-15 16:24:21 +01:00
Stephan	81459c3659	Merge pull request #1174 from umbraco/temp-U4-8065 U4-8065 Inherited from is empty - reverts 10617d1bd52bdac57534a7d7b8…	2016-03-15 16:08:26 +01:00
Rune Hem Strand	8907c9855b	Merge pull request #1172 from umbraco/temp-U4-7185 Temp u4 7185	2016-03-15 16:02:47 +01:00
Stephan	e1bf30ec26	Merge pull request #1175 from umbraco/temp-U4-8106 U4-8106 Content type inheritance can be broken by compositions	2016-03-15 15:53:37 +01:00
Shannon	6bb9c5b81c	U4-8168 Cannot re-order/move locked property types - such as the locked/system member type properties	2016-03-15 15:43:21 +01:00
Shannon	6aafbfb245	U4-8106 Content type inheritance can be broken by compositions	2016-03-15 15:25:05 +01:00
Shannon	d5fe8c11c8	U4-8065 Inherited from is empty - reverts `10617d1bd5`, turns out this is why we needed that property value	2016-03-15 15:08:53 +01:00
Shannon	3fdb122e91	U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4	2016-03-15 14:44:03 +01:00
Shannon Deminick	710dda164f	Merge pull request #1166 from umbraco/temp-U4-7708 U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype …	2016-03-15 13:57:27 +01:00
Claus	07d0d82bd1	Merge branch 'U4-8026' of git://github.com/arknu/Umbraco-CMS into arknu-U4-8026	2016-03-15 13:47:10 +01:00
Claus	91eb3ea59e	Merge pull request #1152 from AndyButland/u4-7888 Fixed U4-7888 - Cannot change default template for document type	2016-03-15 13:43:07 +01:00
Rune Strand	096f1b6ff9	add selected state to umbFolderGrid	2016-03-15 13:18:48 +01:00
Rune Strand	f24c0d3e7a	Update umbBreadcrumb to use custom controller	2016-03-15 13:18:48 +01:00
Rune Hem Strand	104338c817	A little bit of foldergrid+	2016-03-15 13:18:48 +01:00
Mads Rasmussen	568f098445	umbOverlay first draft	2016-03-15 13:18:48 +01:00
Mads Rasmussen	f46d595f00	fix example on umbStickyBar	2016-03-15 13:18:48 +01:00
Mads Rasmussen	46826ad590	add docs for umbPagination	2016-03-15 13:18:48 +01:00
Mads Rasmussen	a8bd34b77e	add docs for umbMediaGrid	2016-03-15 13:18:48 +01:00
Mads Rasmussen	40774cfff2	rename umbContentGrid controller	2016-03-15 13:18:48 +01:00
Mads Rasmussen	5dde898205	change controller name on umbGenerateAlias	2016-03-15 13:18:48 +01:00
Mads Rasmussen	249287e101	fix umbKeyboardShortcutsOverview example	2016-03-15 13:18:48 +01:00
Mads Rasmussen	3e458e2ba6	add documentation for umbEmptyState	2016-03-15 13:18:48 +01:00
Mads Rasmussen	4f293a8be1	fix umbTooltip example	2016-03-15 13:18:48 +01:00
Mads Rasmussen	3b9d9ab8c4	change umbChildSelector controller name	2016-03-15 13:18:48 +01:00
Mads Rasmussen	83f875dadd	fix umbConfirmAction example	2016-03-15 13:18:48 +01:00
Mads Rasmussen	89df81d3df	update umbButtonGroup example to match newest code	2016-03-15 13:18:48 +01:00
Mads Rasmussen	2e4ee42c90	fix small issue with umbButton example	2016-03-15 13:18:48 +01:00
Mads Rasmussen	a03858a726	fix examples in umbEditorHeader	2016-03-15 13:18:48 +01:00
Mads Rasmussen	253174d4b3	umbEditorSubHeader: move some example pieces to other directive examples to make it less overwhelming	2016-03-15 13:18:48 +01:00
Mads Rasmussen	947889fae6	update umbFooterContent directives example with a form element	2016-03-15 13:18:48 +01:00
Mads Rasmussen	7ee0b582dd	update umbEditorFooter example with a form element	2016-03-15 13:18:48 +01:00
Mads Rasmussen	7bec4efc60	update umbEditorView with a better example	2016-03-15 13:18:48 +01:00
Mads Rasmussen	571d8086c8	update umbContentGrid docs to match latest directive changes	2016-03-15 13:18:48 +01:00
Rune Strand	8abeefe6bb	Fix merge conflict	2016-03-15 13:18:48 +01:00
Mads Rasmussen	0aaf3eea02	added documentation for umbChildSelector	2016-03-15 13:18:48 +01:00
Mads Rasmussen	8fc84f9b09	added documentation to umbLockedField	2016-03-15 13:18:48 +01:00
Mads Rasmussen	493b98a771	added documentation to umbGenerateAlias	2016-03-15 13:18:48 +01:00
Mads Rasmussen	114a9b4d33	added documentation for umbFolderGrid	2016-03-15 13:18:48 +01:00
Mads Rasmussen	824b1e7c08	added documentation for umbContentGrid	2016-03-15 13:18:48 +01:00
Mads Rasmussen	dfa9b297db	added documentation for umbStickyBar	2016-03-15 13:18:48 +01:00
Mads Rasmussen	adceb24651	added documentation for umbConfirmAction	2016-03-15 13:18:48 +01:00
Mads Rasmussen	c7f1a1419a	added documentation for umbTooltip	2016-03-15 13:18:48 +01:00
Mads Rasmussen	8878b5e21c	added documentation for umbButtonGroup	2016-03-15 13:18:48 +01:00
Mads Rasmussen	6ebb1d1b4b	added documentation for umbButton	2016-03-15 13:18:48 +01:00
Mads Rasmussen	583cd2d1e9	added documentation for sub header directives	2016-03-15 13:18:48 +01:00
Mads Rasmussen	86c6b01e73	added documentation for editor directives	2016-03-15 13:18:48 +01:00
Mads Rasmussen	1170e222e3	added umbBreadcrumbs documentation - first draft	2016-03-15 13:18:48 +01:00
Mads Rasmussen	fe004db7d5	added umbLoadIndicator documentation - first draft	2016-03-15 13:18:48 +01:00
Mads Rasmussen	9e75ffb332	added umbKeyboardShortcutsOverview documentation - first draft	2016-03-15 13:18:48 +01:00
Mads Rasmussen	d0bb6b7aa4	fix broken directives overview + set marker on deprecated directives	2016-03-15 13:18:48 +01:00
Jeremy Pyne	91da14b0c6	Second fix for partial views.	2016-03-11 14:56:55 -05:00
Jeremy Pyne	f361e286ed	This minor fix will restore the editors cursor in CoreArea editor boxes when they save the item. There is a check included to prevent this behavior is the server level code changes the file for some reason as then the cursor location could act unpredictably, so instead we just let it reset to the beginning of the file.	2016-03-11 14:44:21 -05:00
Shannon	e60e4e52fc	U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype Hijack Controller causes problem with submissions	2016-03-10 18:00:14 +01:00
Sebastiaan Janssen	effe7c1669	Fixes unit test	2016-03-10 11:20:44 +01:00
Shannon	af1fe425a2	udpates ext method to specify an explicit marker stage, updates UmbracoDefaultOwinStartup to be more flexible with the methods to override.	2016-03-09 19:37:37 +01:00
Shannon	22385d40db	U4-4219 Can't Preview protected pages	2016-03-09 17:35:50 +01:00
Mads Rasmussen	87667ec2d1	Fixes: U4-8016 Pick only images from media	2016-03-08 20:56:24 +01:00
bjarnef	367073e02e	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7	2016-03-03 17:58:36 +01:00
AndyButland	1a4322eb48	Fix issue with database field check that led to default template for content type not being set	2016-02-29 09:04:50 +00:00
Asbjørn Riis-Knudsen	e8f84cfec0	Add parens around all BinaryExpressions to make sure that errors such U4-8026 do not happen	2016-02-25 12:20:58 +01:00
bjarnef	6effcdfce9	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7	2016-02-15 18:52:30 +01:00
bjarnef	4bcee1df71	Change property to maximum	2016-02-03 02:42:47 +01:00
bjarnef	8e2716d300	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-02-03 02:29:30 +01:00
bjarnef	b8c7b09d25	Update styles + adjust sort of table row	2016-02-03 02:29:21 +01:00
bjarnef	741057b7d6	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-02-02 15:21:34 +01:00
bjarnef	769b74afef	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-02-02 15:15:49 +01:00
bjarnef	6d4364a8b9	Modify sortable table row	2016-02-02 03:47:10 +01:00
bjarnef	efb7bc7689	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-02-01 22:02:42 +01:00
bjarnef	6536286ffa	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-02-01 13:34:22 +01:00
bjarnef	6f07898979	Max config adjustments	2016-02-01 02:13:05 +01:00
bjarnef	7cf4c33d15	Fix max number in config and other adjustments	2016-02-01 01:52:51 +01:00
bjarnef	d75ebed53d	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-01-31 14:57:08 +01:00
bjarnef	3136981043	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425	2016-01-28 20:05:33 +01:00
bjarnef	893ca14859	Config for max items	2016-01-28 01:01:06 +01:00