Torkel Ödegaard b762f56aee Merge branch 'master' into panel_repeat ...

Conflicts:
	public/app/features/templating/templateValuesSrv.js

2015-04-29 13:59:15 +02:00

..

all.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

console-ctrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

errorCtrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

grafanaCtrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

inspectCtrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

jsonEditorCtrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

loginCtrl.js

Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660

2015-04-29 10:08:01 +02:00

metricKeys.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

pulldown.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

search.js

Merge branch 'master' into panel_repeat

2015-04-27 13:53:02 +02:00

sidemenuCtrl.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00