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 external-plugins

Browse Source 
Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts
This commit is contained in:
Torkel Ödegaard
2015-12-14 17:28:57 +01:00
parent 0697274695 55448de92a
commit 201f50b121
127 changed files with 3139 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/routes/all.js
View File

@@ -141,6 +141,9 @@ define([
controller: 'PluginEditCtrl',
resolve: loadOrgBundle,
})
.when('/global-alerts', {
templateUrl: 'app/features/dashboard/partials/globalAlerts.html',
})
.otherwise({
templateUrl: 'app/partials/error.html',
controller: 'ErrorCtrl'