From 231c68edd7f6084503f7e711bba3d7493e9da9f1 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 28 Oct 2013 10:58:37 -0700 Subject: [PATCH 1/2] added a 1 minute timeout to require.js. --- src/app/components/require.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js index a8833f2c08ec4..18f67031bb2ed 100644 --- a/src/app/components/require.config.js +++ b/src/app/components/require.config.js @@ -86,5 +86,6 @@ require.config({ datepicker: ['jquery', 'bootstrap'], elasticjs: ['angular', '../vendor/elasticjs/elastic'] - } + }, + waitSeconds: 60, }); From b3f7dda9954961af127e1735e6ca798fa0aae266 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Wed, 30 Oct 2013 11:02:31 -0700 Subject: [PATCH 2/2] readme update --- README.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c44faa76ffcbe..a120d4ccb56f7 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,6 @@ __NOTE__: You have reached the Kibana 3 repository. Kibana 3 is a completely new version of Kibana written entirely in HTML and Javascript. You can find the Kibana 2 repository at [https://github.com/rashidkpc/Kibana](https://github.com/rashidkpc/Kibana) -### Important! -The dashboard storage format has changed in Kibana 3 milestone 3. Existing dashboards are unfortunately not backward compatible. However there are some great new features: -* Every panel supports multi-query -* Customizable query colors and labels -* Queries, labels and colors are synced across panels at all times -* Queries can be assigned explicitly to panels, they can also be pinned and unpinned -* New filtering functionality -* Filters can be toggled, removed and edited -* Drill down won't overwrite your queries, labels or colors -* Confusing group functionality has been removed -* Index configuration has been moved from the timepicker, to the main dashboard editor -* The stringquery panel has been replaced with a more polished 'query' panel - More information about Kibana 3 can be found at [http://www.elasticsearch.org/overview/kibana/](http://www.elasticsearch.org/overview/kibana/) ## Overview @@ -56,3 +43,9 @@ __A__: A simple nginx virtual host and proxy configuration can be found in the s ### Support If you have questions or comments the best place to reach me is #logstash or #elasticsearch on irc.freenode.net + +### Contributing + +Please see [CONTRIBUTING.md](https://github.com/elasticsearch/kibana/blob/master/CONTRIBUTING.md). +If you have a bugfix or new feature that you would like to contribute to Kibana, **please find or open an issue +about it first.** \ No newline at end of file