Dan Cech b387c1291d Merge branch 'master' into gnet-oauth ... Conflicts: pkg/api/login_oauth.go		2016-09-21 09:39:35 -04:00
..
app	Merge branch 'master' into gnet-oauth	2016-09-21 09:39:35 -04:00
dashboards	feat(export): export dashboard modal	2016-05-17 11:17:11 +02:00
emails	feat(emails): move bg color to main table	2016-09-08 09:59:51 +02:00
fonts	old grafana wordmark was still showing on login and sidebar (#4972)	2016-05-11 09:08:25 +02:00
img	feat(alerting): add image for howto popup	2016-08-18 18:36:58 +02:00
sass	Merge branch 'master' into gnet-oauth	2016-09-21 09:39:35 -04:00
test	feat(adhoc filters): basic implementation for ad hoc filters for elasticsearch, #6038	2016-09-21 08:48:49 +02:00
vendor	fix(graph): increase Y min and max range when series values are the same, (#6082)	2016-09-20 11:38:18 +02:00
views	Merge branch 'v3.1.x'	2016-08-01 12:23:36 +02:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00