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 react-panels

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-08-24 17:29:10 +02:00
parent 4e089229fb 8a99fa269d
commit 0b794ff685
465 changed files with 20245 additions and 11319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/plugins/plugin_loader.ts
View File

@@ -57,7 +57,7 @@ System.config({
css: 'vendor/plugin-css/css.js',
},
meta: {
'*': {
'/*': {
esModule: true,
authorization: true,
loader: 'plugin-loader',
@@ -127,6 +127,7 @@ import 'vendor/flot/jquery.flot.stackpercent';
import 'vendor/flot/jquery.flot.fillbelow';
import 'vendor/flot/jquery.flot.crosshair';
import 'vendor/flot/jquery.flot.dashes';
import 'vendor/flot/jquery.flot.gauge';
const flotDeps = [
'jquery.flot',
@@ -138,6 +139,7 @@ const flotDeps = [
'jquery.flot.selection',
'jquery.flot.stackpercent',
'jquery.flot.events',
'jquery.flot.gauge',
];
for (let flotDep of flotDeps) {