Merge pull request #497 from spenceralger/extended-jquery-fix

Fixes the way that jQuery is loaded with RequireJS, closes #496
elastic · Sep 15, 2013 · 0325f78 · 0325f78
2 parents 8f67381 + 2a1c67f
commit 0325f78
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 46 deletions.
diff --git a/dist/app/app.js b/dist/app/app.js
diff --git a/dist/app/components/require.config.js b/dist/app/components/require.config.js
diff --git a/dist/app/dashboards/logstash.js b/dist/app/dashboards/logstash.js
@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];
 

diff --git a/dist/app/panels/bettermap/leaflet.amd.js b/dist/app/panels/bettermap/leaflet.amd.js
@@ -1,3 +1,3 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
diff --git a/dist/app/panels/bettermap/leaflet/leaflet.js b/dist/app/panels/bettermap/leaflet/leaflet.js
diff --git a/dist/app/panels/bettermap/leaflet/plugins.js b/dist/app/panels/bettermap/leaflet/plugins.js
diff --git a/dist/app/panels/bettermap/module.js b/dist/app/panels/bettermap/module.js
diff --git a/dist/app/panels/column/module.js b/dist/app/panels/column/module.js
diff --git a/dist/app/panels/dashcontrol/module.js b/dist/app/panels/dashcontrol/module.js
diff --git a/dist/app/panels/derivequeries/module.js b/dist/app/panels/derivequeries/module.js
diff --git a/dist/app/panels/fields/module.js b/dist/app/panels/fields/module.js
diff --git a/dist/app/panels/filtering/module.js b/dist/app/panels/filtering/module.js
diff --git a/dist/app/panels/histogram/module.js b/dist/app/panels/histogram/module.js
diff --git a/dist/app/panels/hits/module.js b/dist/app/panels/hits/module.js
diff --git a/dist/app/panels/map/lib/map.europe.js b/dist/app/panels/map/lib/map.europe.js
diff --git a/dist/app/panels/map/lib/map.usa.js b/dist/app/panels/map/lib/map.usa.js
diff --git a/dist/app/panels/map/lib/map.world.js b/dist/app/panels/map/lib/map.world.js
diff --git a/dist/app/panels/map/module.js b/dist/app/panels/map/module.js