Merge remote-tracking branch 'upstream/master'

Conflicts: docs/kibana/configuration/config.js.asciidoc src/app/components/settings.js src/app/panels/dashcontrol/module.html src/app/partials/dasheditor.html src/config.js
2013-12-10 11:02:19 +01:00
parent a051f30eba 4ce88ee7b7
commit d0df36433d
16 changed files with 152 additions and 82 deletions
@@ -8,7 +8,7 @@
    </div>
  </div>

-  <div ng-show="editor.index == 0">
+  <div ng-if="editor.index == 0">
    <div class="row-fluid">
      <div class="span4">
        <label class="small">Title</label><input type="text" class="input-large" ng-model='dashboard.current.title'></input>