Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9

src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js

@@ -4,29 +4,32 @@
 * @restrict E
 **/
 angular.module("umbraco.directives")
-    .directive('umbProperty', function (umbPropEditorHelper) {
+    .directive('umbProperty', function (umbPropEditorHelper, userService) {
         return {
             scope: {
                 property: "="
             },
             transclude: true,
             restrict: 'E',
-            replace: true,        
+            replace: true,
             templateUrl: 'views/components/property/umb-property.html',
-            link: function(scope) {
-                scope.propertyAlias = Umbraco.Sys.ServerVariables.isDebuggingEnabled === true ? scope.property.alias : null;
+            link: function (scope) {
+                userService.getCurrentUser().then(function (u) {
+                    var isAdmin = u.userGroups.indexOf('admin') !== -1;
+                    scope.propertyAlias = (Umbraco.Sys.ServerVariables.isDebuggingEnabled === true || isAdmin) ? scope.property.alias : null;
+                });
             },
             //Define a controller for this directive to expose APIs to other directives
             controller: function ($scope, $timeout) {
-               
+
                 var self = this;
 
                 //set the API properties/methods
-                
+
                 self.property = $scope.property;
-                self.setPropertyError = function(errorMsg) {
+                self.setPropertyError = function (errorMsg) {
                     $scope.property.propertyErrorMessage = errorMsg;
                 };
             }
         };
-    });
+    });

src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js

@@ -493,7 +493,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * @methodOf umbraco.resources.mediaResource
           *
           * @description
-          * Empties the media recycle bin
+          * Paginated search for media items starting on the supplied nodeId
           *
           * ##usage
           * <pre>
@@ -506,7 +506,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * @param {string} query The search query
           * @param {int} pageNumber The page number
           * @param {int} pageSize The number of media items on a page
-          * @param {int} searchFrom Id to search from
+          * @param {int} searchFrom NodeId to search from (-1 for root)
           * @returns {Promise} resourcePromise object.
           *
           */

src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js

@@ -1,7 +1,7 @@
 angular.module("umbraco.install").controller("Umbraco.Install.UserController", function($scope, installerService) {
     
     $scope.passwordPattern = /.*/;
-    $scope.installer.current.model.subscribeToNewsLetter = true;
+    $scope.installer.current.model.subscribeToNewsLetter = false;
     
     if ($scope.installer.current.model.minNonAlphaNumericLength > 0) {
         var exp = "";

src/Umbraco.Web.UI.Client/src/less/modals.less

@@ -181,7 +181,7 @@
 	width: 640px !important;
 }
 .umb-modal i {
-  font-size: 14px;
+  font-size: 20px;
 } 
 .umb-modal .breadcrumb {
 	background: none;

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html

@@ -215,7 +215,7 @@
                                             <div class="row form-search">
                                                 <div class="span8 input-append">
                                                     <input type="text" class="search-query" ng-model="searcher.searchText" no-dirty-check />
-                                                    <button type="button" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
+                                                    <button type="submit" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
                                                 </div>
                                             </div>
                                             <div class="row">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html

@@ -10,15 +10,15 @@
           data for any existing content that is based on this configuration.</p>
           <p><strong>Modifying only the label will not result in data loss.</strong></p>
       </div>
+
+       <umb-control-group label="@general_name">
+           <input type="text" ng-model="currentRow.name" />
+       </umb-control-group>
        
        <umb-control-group label="@general_label">
            <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
        </umb-control-group>
 
-      <umb-control-group label="@general_name">
-          <input type="text" ng-model="currentRow.name" />
-      </umb-control-group>
-
       <div class="uSky-templates-template"
            style="margin: 0; width: 350px; position: relative;">