13977 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Efraimsson	060cd6ebef	Merge branch 'master' into settings-icons-fix	2018-04-13 14:49:08 +02:00
Marcus Efraimsson	55d262655a	changelog: adds note for #11569 ... [skip ci]	2018-04-13 11:06:57 +02:00
Marcus Efraimsson	167d5aebe6	Merge pull request #11576 from flopp999/patch-3 ... change default annotation limit from 10 to 100 when querying api	2018-04-13 10:55:01 +02:00
flopp999	74f570fdf4	change annotation limit from 10 to 100	2018-04-12 17:38:10 +02:00
Daniel Lee	b481e1515d	Merge pull request #11456 from alexanderzobnin/fix-11053 ... Migrating to baron scrollbar WIP	2018-04-12 14:56:04 +02:00
Alexander Zobnin	f8543fced9	remove mistakenly added styles	2018-04-12 14:29:35 +03:00
Alexander Zobnin	31e5c1fa1f	Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar	2018-04-12 14:23:47 +03:00
Alexander Zobnin	74c10515ad	fix right side legend rendering in phantomjs	2018-04-12 14:22:19 +03:00
Carl Bergquist	be2016f46e	Merge pull request #11571 from bergquist/remove-codecov ... build: remove code cov	2018-04-12 11:38:00 +02:00
Daniel Lee	d4398479f5	scrollbar: fix so no overflow for legend under graph ... Adds 1px of padding to the graph legend scroll div so that a non-table legend does not get an unnecessary scroll bar.	2018-04-12 11:26:27 +02:00
bergquist	b220162b91	build: remove code cov	2018-04-12 11:26:05 +02:00
Daniel Lee	76c87d1a74	scrollbar: fixes continuation scrolling for iOS ... The -webkit-overflow-scrolling is an iOS only property: https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling that turns on momementum/continuation scrolling for iOS devices. This means that when swiping, the scroll continues for a half second rather than instantly stopping the scroll when the user lifts their finger from the screen.	2018-04-12 10:53:27 +02:00
Patrick O'Carroll	229486015d	added styling to fontawesome icons so they have same size as the other icons	2018-04-12 10:44:00 +02:00
Carl Bergquist	dca73b9ab6	Merge pull request #11567 from 247Sports/docs/cloudwatch-backend-iam-policy ... Add minimal IAM policy example for CloudWatch data source	2018-04-12 10:23:56 +02:00
Tim O'Guin	1f0dfbbf86	Improve wording	2018-04-11 21:36:07 -05:00
Tim O'Guin	ee7943b9b2	Add minimal IAM policy example for CloudWatch data source	2018-04-11 21:29:11 -05:00
Marcus Efraimsson	cdcaaa5d03	minor scrollbar fixes ... Hide page scrollbar when rendering using phantomjs. Hide baron scrollbar when rendering using phantomjs.	2018-04-11 20:12:32 +02:00
Daniel Lee	db83255460	scrollbar: remove unused div ... Fixes the height of the settings menu	2018-04-11 19:19:33 +02:00
Daniel Lee	e74be16900	Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar	2018-04-11 18:33:00 +02:00
Marcus Efraimsson	a1b53674a9	dashboard: show baron scrollbar in dashboard panel when mouse is over ... This should make the scrolling user experience much better since it will highlight and show that content actually can be scrolled when hovering over a panel.	2018-04-11 18:12:48 +02:00
Marcus Efraimsson	9549aadd26	fix so that page scrollbars can be scrolled by keyboard on page load ... The page scrollbars are custom, not rendered on the body element and with css property overflow set for scroll to be enabled. For being able to scroll the page using the keyboard when a page loads, some custom code was needed. This fix should both work when doing a full reload of a url and when navigating to other pages/dashboards. For those pages having an input field that are focused on load, scrolling by keyboard (arrow up/down) will obviously not work.	2018-04-11 17:49:40 +02:00
Marcus Efraimsson	2956011b60	fix so that dash list panel are rendered correctly ... This resolves issue with dash list panel getting scrollbars attached to incorrect elements. Now the panel content are rendered correctly and all content are displayed as expected.	2018-04-11 17:44:51 +02:00
Marcus Efraimsson	8c04eb272d	panel: add baron scroller to correct element ... This resolves issue with alert list panel getting scrollbars attached to incorrect element. Now the panel content are rendered correctly and all content are displayed as expected.	2018-04-11 17:41:20 +02:00
Daniel Lee	83f7ac18db	Merge remote-tracking branch 'upstream/master' into 11053-remove-native-scrollbar	2018-04-11 14:32:19 +02:00
Leonard Gram	041067f5f0	Windows build updated to go1.10.	2018-04-11 14:31:23 +02:00
Daniel Lee	25ec7b5b02	scrollbar: use native scroll for page	2018-04-11 14:30:39 +02:00
bergquist	93e1546f73	alerting: handle invalid json format ... closes #11003	2018-04-10 22:22:12 +02:00
Daniel Lee	9e1a1ed572	Merge pull request #11501 from grafana/metric-segment-to-ts ... migrated metric_segment to ts	2018-04-10 12:41:58 +02:00
Daniel Lee	63dab4ffe4	Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053	2018-04-10 10:33:47 +02:00
Patrick O'Carroll	6719bdf9bd	added @ngInject	2018-04-10 09:24:54 +02:00
Carl Bergquist	b610f77bd6	Merge pull request #11541 from calebtote/patch-1 ... Update annotations.md to contain correct annotations api path	2018-04-10 09:07:11 +02:00
Daniel Lee	c860f21052	playlist: add missing nginject attribute	2018-04-09 21:33:18 +02:00
Caleb Tote	5f47523d76	Update annotations.md to contain correct annotations api path	2018-04-09 15:09:37 -04:00
Daniel Lee	23ed5dfc8a	Merge pull request #11531 from grafana/11391_access ... Rename direct/proxy access mode to browser/server	2018-04-09 14:48:29 +02:00
Alexander Zobnin	d9ba16f550	scrollbar: fix phantomjs rendering error	2018-04-09 14:21:20 +03:00
Sven Klemm	00524e6827	prevent angular from evaluating {{hostname}} in tooltip (#11514)	2018-04-09 12:51:17 +02:00
Marcus Efraimsson	95132165f8	data source: rename direct/proxy access mode in data source settings ... Changes access drop down options names: - proxy -> Server (Default) - direct -> Browser Replace access drop down info icon/tooltip with expandable/collapsable help section.	2018-04-09 12:47:19 +02:00
Torkel Ödegaard	d60c7b2013	docs: updated debian distro in install docs to stretch, closes #11527	2018-04-09 08:18:58 +02:00
Daniel Lee	ce787b88bf	css: quick fix after IE11 changes ... Temporary fix so that the add panel panel works properly. This will break a3f15ced68.	2018-04-06 21:29:42 +02:00
Alexander Zobnin	41e5d66e39	scrollbar: fix add panel height bug	2018-04-06 20:31:44 +03:00
Alexander Zobnin	d3d64337b4	scrollbar: styles cleanup	2018-04-06 20:00:03 +03:00
Daniel Lee	817b8d3946	Merge pull request #11511 from grafana/side-menu-icon-fix ... fixed sidemenu icon issue created by earlier pr	2018-04-06 17:53:50 +02:00
Daniel Lee	3fd9c787cf	Merge pull request #11497 from grafana/dash-class-to-ts ... migrated dash_class to ts	2018-04-06 17:48:18 +02:00
Daniel Lee	51148709bb	Merge pull request #11496 from grafana/segment-srv-to-ts ... migrated segment_srv to ts	2018-04-06 11:18:51 +02:00
Patrick O'Carroll	6d6ecbd458	fixed sidemenu icon issue created by earlier pr	2018-04-06 10:54:06 +02:00
Daniel Lee	4ac290215e	Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053	2018-04-05 22:30:13 +02:00
Patrick O'Carroll	35bc4e4632	migrated metric_segment to ts	2018-04-05 17:10:32 +02:00
Alexander Zobnin	9f07ae72ee	scrollbar: fix search scroller in mobile view	2018-04-05 16:47:20 +03:00
Alexander Zobnin	d6233714d2	Merge remote-tracking branch 'upstream/master' into fix-11053	2018-04-05 16:30:46 +03:00
Marcus Efraimsson	166778b32a	Merge pull request #11439 from grafana/ldap-block ... docker: add users and groups to ldap block	2018-04-05 15:30:11 +02:00