17120 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Efraimsson	d3c28a814a	changelog: add notes about closing #13674 ... [skip ci]	2018-10-18 13:45:50 +02:00
Marcus Efraimsson	77f23018a5	Merge pull request #13684 from mtanda/cw_concurrent_map ... fix concurrent map writes	2018-10-18 13:41:39 +02:00
Torkel Ödegaard	0b490912bd	Merge pull request #13716 from grafana/davkal/13613-fix-split-layout ... Explore: fix render issues in split view	2018-10-18 13:00:23 +02:00
David	bf1a0585ed	Merge pull request #13712 from grafana/davkal/explore-react-table ... Explore: Use react-table as table component	2018-10-18 12:44:56 +02:00
Adrien Fillon	781e66ba3c	fix LDAP Grafana admin logic ... Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com> Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>	2018-10-18 12:36:48 +02:00
Leonard Gram	287d0e8333	docs: cleanup of how to build for docker. ... [skip ci]	2018-10-18 11:10:39 +02:00
David Kaltschmidt	9e647590ac	Review feedback, increased height	2018-10-18 10:42:25 +02:00
Marcus Efraimsson	367a2af1c2	changelog: add notes about closing #12342 ... [skip ci]	2018-10-18 09:50:21 +02:00
Marcus Efraimsson	a776120bee	update changelog ... [skip ci]	2018-10-18 09:47:18 +02:00
Marcus Efraimsson	1d0dee189c	Merge pull request #13705 from Yukinoshita-Yukino/master ... Add socket support for mysql data source	2018-10-18 09:45:50 +02:00
Peter Holmberg	ab2be340f7	remove not used file	2018-10-18 09:34:51 +02:00
Peter Holmberg	02769b6d3c	Merge branch 'master' into datasource-dashboards-to-react	2018-10-18 08:34:31 +02:00
Yuan Liu	f640df7a2c	simplify code	2018-10-18 01:45:14 +08:00
David Kaltschmidt	a1410b54a5	Explore: fix render issues in split view ... - avoid line wrap in row tools (add/remove/clear) - avoid text overflow in query field	2018-10-17 17:59:03 +02:00
David	1d60c45a04	Merge pull request #13663 from miqh/fix/label-value-suggestions ... Fix typeahead behaviour for QueryField	2018-10-17 16:56:02 +02:00
Marcus Efraimsson	da89c27caf	Merge pull request #13702 from grafana/data-source-instance-to-react ... Support Data source permissions	2018-10-17 16:54:57 +02:00
Leonard Gram	675bf00727	A list of where to make changes when upgrading Go and Node.js (#13693)	2018-10-17 16:39:03 +02:00
Peter Holmberg	84bbfe11ca	tests	2018-10-17 16:14:45 +02:00
Michael Huynh	22e0ff8b9c	Update PromQueryField tests to address fixed bug ... Related: #13484	2018-10-17 22:09:21 +08:00
Michael Huynh	a8c5ab76b3	Fix typeahead behaviour for QueryField ... These changes were originally intended to address a bug whereby a suggestion for an already selected label value continues to appear. However, they also appear to fix several other problems in the area: - Wrong suggestions when using negated label matching operators - Misaligned label value suggestion replacements Related: #13484	2018-10-17 22:09:03 +08:00
Leonard Gram	3245227016	permissions: cleanup.	2018-10-17 15:58:52 +02:00
Peter Holmberg	c2c3e15022	hooked up actions	2018-10-17 15:56:34 +02:00
David Kaltschmidt	ff67213b42	Explore: Use react-table as table component ... - adds react-table as dependency - replaces custom table component in Explore - vendors react-table styles and overrides them (currently in explore.scss)	2018-10-17 14:58:04 +02:00
Peter Holmberg	f25a843a2c	created view	2018-10-17 14:36:18 +02:00
Leonard Gram	cd96ef3590	docs: installing custom plugins in docker. ... [skip ci]	2018-10-17 14:34:40 +02:00
Marcus Efraimsson	b036678c89	changelog: add notes about closing #13692 ... [skip ci]	2018-10-17 13:46:41 +02:00
Marcus Efraimsson	cf93b1e700	Merge pull request #13708 from svenklemm/interpolateVariable ... postgres: fix template variables error	2018-10-17 13:42:47 +02:00
Marcus Efraimsson	7b656097a7	postgres: use arrow function declaration of interpolateVariable	2018-10-17 13:30:07 +02:00
Sven Klemm	ec0fd96f08	Use closure for calling interpolateVariable	2018-10-17 12:30:07 +02:00
Marcus Efraimsson	6a89874290	changelog: add notes about closing #12308 ... [skip ci]	2018-10-17 12:01:27 +02:00
Marcus Efraimsson	62f21a254a	Merge pull request #12337 from mtanda/cw_regions ... show all CloudWatch regions (avoid hard coding)	2018-10-17 11:55:43 +02:00
Yuan Liu	36dbc5f51c	Add socket support for mysql data source	2018-10-17 17:45:06 +08:00
Yuan Liu	76fc48e2eb	Merge pull request #1 from grafana/master ... Syncing	2018-10-17 17:14:13 +08:00
bergquist	2afec0e7fb	changelog: adds note about closing #12330 and #6696 ... [skip ci]	2018-10-17 11:12:39 +02:00
Peter Holmberg	314fffeae1	Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react	2018-10-17 11:12:13 +02:00
Carl Bergquist	94e2d2b483	Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert ... Add channel option to disable the resolved alert (OK Message)	2018-10-17 11:08:39 +02:00
Peter Holmberg	b7b0ce0107	remove addpermissions component	2018-10-17 11:07:17 +02:00
Torkel Ödegaard	29f1c9259a	Merge pull request #13352 from amuraru/patch-2 ... Updated phantomjs render script to take full height screenshots	2018-10-17 11:00:44 +02:00
Marcus Efraimsson	52f398e7f7	cloudwatch: return a distinct list of regions	2018-10-17 10:58:06 +02:00
Marcus Efraimsson	518e485e36	docs: update cloudwatch iam policy description	2018-10-17 10:52:46 +02:00
Peter Holmberg	34c0bed922	Merge pull request #13700 from grafana/permissions-code-to-enterprise ... Permissions code to enterprise	2018-10-17 10:46:53 +02:00
bergquist	70385119bc	removes d in disableResolvedMessage	2018-10-17 10:41:18 +02:00
Peter Holmberg	dd2fb7961f	removed snaps	2018-10-17 10:37:56 +02:00
Peter Holmberg	776f9aa288	Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise	2018-10-17 10:00:18 +02:00
bergquist	5566a61aef	alerting: tests default value for disable resolve message	2018-10-17 09:53:03 +02:00
Marcus Efraimsson	176c857900	Merge pull request #13696 from Yukinoshita-Yukino/patch-1 ... Update doc due to Dingtalk client layout change	2018-10-17 09:37:08 +02:00
Mitsuhiro Tanda	c64a5a6e0e	re-add hard coded region list	2018-10-17 14:02:02 +09:00
Yuan Liu	7946a405f5	update doc due to client layout change	2018-10-17 10:24:05 +08:00
Dave Waters	a3137e731d	clean up tests	2018-10-16 20:39:07 -04:00
Dave Waters	e9b8051724	Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert	2018-10-16 17:43:26 -04:00