Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js

@@ -91,7 +91,8 @@ function showPopup() {
  * hide popup function.
  */
 function hidePopup() {
-    $(modalPopupContent).html('');
+    $(modalPopupContent).html("");
+    $(modalPopupContent).removeClass("operation-data");
     $(modalPopup).modal('hide');
     $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js

@@ -70,7 +70,7 @@ var InitiateViewOption = null;
 
         if(arrowPosition >= parentHeight){
             parentHeight = arrowPosition + 50;
-            $(arrow).siblings(".panel.active").height(parentHeight);
+            $(arrow).siblings(".panel.active").css("min-height",parentHeight);
         }else{
             $(arrow).parent().removeAttr("style");
         }

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js

@@ -2559,6 +2559,22 @@ $(document).ready(function () {
         }
     });
 
+
+    $(advanceOperations).on('hidden.bs.collapse', function () {
+        if($(this).find('input').prop('checked')){
+            $(this).find('input').prop('checked',false);
+        }
+    });
+
+
+    $(advanceOperations).on('shown.bs.collapse', function () {
+        if($(this).find('input').prop('checked') == false){
+            $(this).find('input').prop('checked',true);
+        }
+    });
+
+
+
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
         // get a copy of .cloneable and create new .cloned div element

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs

@@ -52,4 +52,15 @@ under the License. --}}
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-md-4 wr-text">
+            <div class="wr-buttons text-center">
+                <br class="c-both" />
+                <br/>
+                For evaluation purposes, you can skip the installer and proceed with enrollment.
+                <br/><br/>
+                <a href="#" class="btn btn-secondary">Skip Agent Installer</a>
+            </div>
+        </div>
+    </div>
 {{/zone}}