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 panel_repeat

Browse Source 
Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html
This commit is contained in:
Torkel Ödegaard
2015-04-27 13:53:02 +02:00
parent c658189c85 8a986ec340
commit bf6f0f1a65
686 changed files with 69990 additions and 12483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/features/dashboard/all.js Normal file
View File

@@ -0,0 +1,21 @@
define([
'./dashboardCtrl',
'./dashboardNavCtrl',
'./snapshotTopNavCtrl',
'./saveDashboardAsCtrl',
'./playlistCtrl',
'./rowCtrl',
'./shareModalCtrl',
'./shareSnapshotCtrl',
'./submenuCtrl',
'./dashboardSrv',
'./keybindings',
'./viewStateSrv',
'./playlistSrv',
'./timeSrv',
'./unsavedChangesSrv',
'./directives/dashSearchView',
'./graphiteImportCtrl',
'./dynamicDashboardSrv',
'./importCtrl',
], function () {});