Merge branch 'master' into apps

public/app/core/controllers/grafana_ctrl.ts

@@ -1,8 +1,8 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import config = require('app/core/config');
+import config from 'app/core/config';
-import store = require('app/core/store');
+import store from 'app/core/store';
-
+import _ from 'lodash';
 import angular from 'angular';
 import $ from 'jquery';
 import coreModule from '../core_module';

public/app/core/controllers/signup_ctrl.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import angular = require('angular');
+import angular from 'angular';
-import config = require('app/core/config');
+import config from 'app/core/config';
 import coreModule from '../core_module';
 
 export class SignUpCtrl {

public/app/core/directives/array_join.ts

@@ -1,7 +1,6 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
-
 import angular from 'angular';
 import coreModule from '../core_module';
 

public/app/core/filters/filters.ts

@@ -1,8 +1,7 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import jquery = require('jquery');
+import jquery from 'jquery';
-import _ = require('lodash');
+import _ from 'lodash';
-
 import angular from 'angular';
 import moment from 'moment';
 import coreModule from '../core_module';

public/app/core/time_series2.ts

@@ -1,7 +1,7 @@
 ///<reference path="../headers/common.d.ts" />
 
-import _ = require('lodash');
+import kbn from 'app/core/utils/kbn';
-import kbn = require('app/core/utils/kbn');
+import _ from 'lodash';
 
 function matchSeriesOverride(aliasOrRegex, seriesAlias) {
   if (!aliasOrRegex) { return false; }

public/app/core/utils/datemath.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
 import moment from 'moment';
 
 var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];

public/app/core/utils/rangeutil.ts

@@ -1,7 +1,6 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
-
 import angular from 'angular';
 import moment from 'moment';
 import * as dateMath from './datemath';

public/app/features/dashboard/timepicker/timepicker.ts

@@ -1,11 +1,11 @@
 ///<reference path="../../../headers/common.d.ts" />
 ///<amd-dependency path="./input_date" name="inputDate" />
 
-import _ = require('lodash');
+import _ from 'lodash';
-import kbn = require('app/core/utils/kbn');
+import kbn  from 'app/core/utils/kbn';
-
 import angular from 'angular';
 import moment from 'moment';
+
 import * as dateMath from 'app/core/utils/datemath';
 import * as rangeUtil from 'app/core/utils/rangeutil';
 

public/app/grafana.ts

@@ -12,10 +12,8 @@ import 'app/core/core';
 
 import $ from 'jquery';
 import angular from 'angular';
-import _ = require('lodash');
+import config from 'app/core/config';
-import bootstrap = require('bootstrap');
+import _ from 'lodash';
-import kbn = require('app/core/utils/kbn');
-import config = require('app/core/config');
 
 export class GrafanaApp {
   registerFunctions: any;

public/app/headers/common.d.ts

@@ -1,17 +1,21 @@
-///<reference path="lodash/lodash.d.ts" />
 ///<reference path="../../vendor/npm/angular2/typings/tsd.d.ts" />
 ///<reference path="../../vendor/npm/angular2/manual_typings/globals.d.ts" />
 
+declare var System: any;
+
 // dummy modules
 declare module 'app/core/config' {
   var config : any;
-  export = config;
+  export default config;
 }
 
-declare var System: any;
+declare module 'lodash' {
+  var lodash: any;
+  export default lodash;
+}
 
 declare module 'moment' {
-  var moment : any;
+  var moment: any;
   export default moment;
 }
 
@@ -27,35 +31,12 @@ declare module 'jquery' {
 
 declare module 'app/core/utils/kbn' {
   var kbn: any;
-  export = kbn;
+  export default kbn;
 }
 
 declare module 'app/core/store' {
   var store : any;
-  export = store;
+  export default store;
 }
 
-declare module 'angular-route' {
-  var kbn : any;
-  export = kbn;
-}
 
-declare module 'angular-sanitize' {
-  var kbn : any;
-  export = kbn;
-}
-
-declare module 'bootstrap' {
-  var kbn : any;
-  export = kbn;
-}
-
-declare module 'angular-strap' {
-  var kbn : any;
-  export = kbn;
-}
-
-declare module 'angular-dragdrop' {
-  var kbn : any;
-  export = kbn;
-}

public/app/plugins/datasource/influxdb/influx_query.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
 import queryPart from './query_part';
 
 export default class InfluxQuery {

public/app/plugins/datasource/influxdb/query_part.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
 
 var index = [];
 var categories = {

public/app/plugins/panels/table/controller.ts

@@ -1,10 +1,9 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import angular = require('angular');
+import angular from 'angular';
-import _ = require('lodash');
+import _ from 'lodash';
-import moment = require('moment');
+import moment from 'moment';
 import PanelMeta from 'app/features/panel/panel_meta2';
-
 import {transformDataToTable} from './transformers';
 
 export class TablePanelCtrl {

public/app/plugins/panels/table/editor.ts

@@ -1,12 +1,13 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import _ = require('lodash');
-import kbn = require('app/core/utils/kbn');
 
+import _ from 'lodash';
 import $ from 'jquery';
 import moment from 'moment';
 import angular from 'angular';
+
 import {transformers} from './transformers';
+import kbn from 'app/core/utils/kbn';
 
 export class TablePanelEditorCtrl {
 

public/app/plugins/panels/table/module.ts

@@ -1,8 +1,8 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import _ = require('lodash');
 import kbn = require('app/core/utils/kbn');
 
+import _ from 'lodash';
 import $ from 'jquery';
 import moment from 'moment';
 import angular from 'angular';

public/app/plugins/panels/table/renderer.ts

@@ -1,8 +1,8 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import _ = require('lodash');
+import _ from 'lodash';
-import kbn = require('app/core/utils/kbn');
 import moment from 'moment';
+import kbn from 'app/core/utils/kbn';
 
 export class TableRenderer {
   formaters: any[];

public/app/plugins/panels/table/transformers.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import moment = require('moment');
+import _ from 'lodash';
-import _ = require('lodash');
+import moment from 'moment';
 import flatten from '../../../core/utils/flatten';
 import TimeSeries from '../../../core/time_series2';
 import TableModel from '../../../core/table_model';

public/test/core/utils/datemath_specs.ts

@@ -1,8 +1,8 @@
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common'
 
 import * as dateMath from 'app/core/utils/datemath';
-import * as _ from 'lodash';
 import moment from 'moment';
+import _ from 'lodash';
 
 describe("DateMath", () => {
   var spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];

public/test/core/utils/rangeutil_specs.ts

@@ -1,7 +1,7 @@
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common'
 
 import * as rangeUtil from 'app/core/utils/rangeutil';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import moment from 'moment';
 
 describe("rangeUtil", () => {