ryan c9396b2889 Merge remote-tracking branch 'grafana/master' into alpha-text2 ... * grafana/master: (57 commits) changelog: adds note for #8253 use default min interval of 1m for sql datasources changelog: adds note about closing #15608 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 Added comment to Docker file moving style: add gicon-shield to sidemenu class Closes #15591 remove `UseBool` since we use `AllCols` fix: Move chunk splitting from prod to common so we get the same files in dev as prod fix: update datasource in componentDidUpdate Closes #15751 changelog: add notes about closing #15739 Moved Server Admin and children to separate menu item on Side Menu (#15592) update version to 6.1.0-pre Viewers with viewers_can_edit should be able to access /explore (#15787) Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712 reordered import Wrapperd playlist controls in clickoutsidewrapper Turn off verbose output from tar extraction when building docker files, fixes #15528 Hide time info switch when no time options are specified Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757) ...		2019-03-05 11:02:03 -08:00
..
app	Merge remote-tracking branch 'grafana/master' into alpha-text2	2019-03-05 11:02:03 -08:00
dashboards	Revert "Updated home dashboard, removed home dashboard header"	2019-01-28 15:01:42 +01:00
emails	Some cleanup	2019-01-05 15:25:07 +01:00
fonts	ux: testing roboto font	2017-08-14 13:57:16 +02:00
img	Updated explore icon and style tweaks	2019-02-18 18:26:24 +01:00
sass	style: add gicon-shield to sidemenu class	2019-03-05 13:46:22 +01:00
test	More files that has fixed with prettier	2019-02-13 11:39:41 +01:00
vendor	Merge branch 'ui-new-red-green-blue'	2019-02-11 16:51:30 +01:00
views	Removed unused controllers and services	2019-02-05 15:09:56 +01:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00