This is a combination of 33 commits.

- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809

www/scripts/apps/admin/main/views/rightPanel.js

@@ -73,11 +73,11 @@ define([
             event.preventDefault();
             var $this = this;
             var link = $(event.currentTarget);
-            var url = link.attr('action') || 'GET';
+            var url = link.attr('action');
 
             if(url) {
                 $.ajax({
-                    type: link.attr('method'),
+                    type: link.attr('method') || 'GET',
                     url: url,
                     data: link.serializeArray(),
                     success: function (data) {

www/scripts/apps/admin/search-engine/views/es_config.js

@@ -0,0 +1,39 @@
+function searchEngineConfigurationFormInit(indexExists) {
+    $("#dropIndexConfirmDialog").dialog({
+        autoOpen: false,
+        modal: true,
+        title: "Drop index",
+        buttons: [
+            {
+                text: "Ok",
+                click: function () {
+                    $("#ElasticSearchDropIndexForm").submit();
+                    $("#dropIndexConfirmDialog").dialog("close");
+                }
+            },
+            {
+                text: "Cancel",
+                click: function () {
+                    $("#dropIndexConfirmDialog").dialog("close");
+                }
+            }
+        ]
+    });
+
+    if(indexExists) {
+        $("BUTTON[data-id=esSettingsCreateIndexButton]").hide();
+        $("BUTTON[data-id=esSettingsDropIndexButton]").show().bind("click", function (event) {
+            event.preventDefault();
+            $("#dropIndexConfirmDialog").dialog("open");
+            return false;
+        });
+    }
+    else {
+        $("BUTTON[data-id=esSettingsDropIndexButton]").hide();
+        $("BUTTON[data-id=esSettingsCreateIndexButton]").show().bind("click", function (event) {
+            event.preventDefault();
+            $("#ElasticSearchCreateIndexForm").submit();
+            return false;
+        });
+    }
+}