IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into query_troubleshooting

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-13 16:47:04 -04:00
parent 7cb6466251 812ac5cb8e
commit 9ff4ab1236
292 changed files with 10391 additions and 3972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/core.ts
View File

@@ -1,7 +1,6 @@
///<reference path="../headers/common.d.ts" />
///<reference path="./mod_defs.d.ts" />
import "./directives/annotation_tooltip";
import "./directives/dash_class";
import "./directives/confirm_click";
import "./directives/dash_edit_link";
@@ -16,6 +15,7 @@ import "./directives/value_select_dropdown";
import "./directives/plugin_component";
import "./directives/rebuild_on_change";
import "./directives/give_focus";
import "./directives/diff-view";
import './jquery_extended';
import './partials';
import './components/jsontree/jsontree';
@@ -47,6 +47,8 @@ import {KeybindingSrv} from './services/keybindingSrv';
import {helpModal} from './components/help/help';
import {collapseBox} from './components/collapse_box';
import {JsonExplorer} from './components/json_explorer/json_explorer';
import {NavModelSrv, NavModel} from './nav_model_srv';
export {
arrayJoin,
@@ -72,4 +74,6 @@ export {
helpModal,
collapseBox,
JsonExplorer,
NavModelSrv,
NavModel,
};