18753 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joesis	92a8c5b81b	log error when resolvePath	2018-12-13 02:10:29 -08:00
Torkel Ödegaard	1d325cf66f	Merge pull request #14423 from grafana/14378-develop-table-options-ux ... Removed side menu for column styles	2018-12-13 09:12:05 +01:00
Torkel Ödegaard	a9e98feea0	Merge pull request #14476 from grafana/metrics-tab-changes-2 ... Metrics tab changes 2	2018-12-13 09:11:14 +01:00
Torkel Ödegaard	8994f3c283	Merge pull request #14461 from grafana/gauge-value-mappings ... Gauge value mappings	2018-12-13 09:11:01 +01:00
Torkel Ödegaard	633ae8c37a	Merge pull request #14457 from grafana/fix/new-datasource-check-lowercase ... Check with lowercase	2018-12-13 09:09:56 +01:00
Torkel Ödegaard	77963e68b5	Merge pull request #14472 from grafana/loki-db-mig ... migration: renames logging ds to loki ds in data_source table	2018-12-13 09:05:18 +01:00
Torkel Ödegaard	f39fd7655e	wip: minor style changes	2018-12-13 08:56:20 +01:00
Torkel Ödegaard	666e8e8330	wip: changes	2018-12-13 07:44:58 +01:00
Daniel Lee	90e2175716	migration: renames logging ds to loki ds in data_source table	2018-12-12 20:54:05 +01:00
Daniel Lee	8e00bb340c	Merge pull request #14471 from grafana/loki-image ... loki: updates the logo	2018-12-12 20:45:22 +01:00
Daniel Lee	2d2254293b	loki: updates the logo	2018-12-12 20:34:33 +01:00
Peter Holmberg	1f533ddfe2	fixing tests	2018-12-12 16:20:47 +01:00
Peter Holmberg	dbba523d3b	mixing color when	2018-12-12 16:16:05 +01:00
Torkel Ödegaard	e08e38bd88	Merge pull request #14460 from grafana/14435_fix ... Add oauth_auto_login setting to defaults file	2018-12-12 14:51:51 +01:00
Torkel Ödegaard	1751a51088	wip	2018-12-12 14:44:40 +01:00
Torkel Ödegaard	5adb0f79df	wip	2018-12-12 14:25:07 +01:00
Torkel Ödegaard	be7e7fcb40	things are working	2018-12-12 13:59:19 +01:00
Marcus Efraimsson	fada00f87e	changelog: add notes about closing #8843 #11175	2018-12-12 13:27:25 +01:00
Marcus Efraimsson	c46d01dc83	Merge pull request #14090 from marefr/8843_pipeline_doc_count ... Fix pipeline aggregations on doc count	2018-12-12 13:21:13 +01:00
Torkel Ödegaard	9f0d7314dd	fixed unit tests	2018-12-12 13:05:24 +01:00
Torkel Ödegaard	b6a5375af1	wip	2018-12-12 12:51:39 +01:00
Torkel Ödegaard	21e1d7b05b	wip	2018-12-12 11:24:18 +01:00
Peter Holmberg	80a2c3b151	redone state	2018-12-12 11:23:33 +01:00
Peter Holmberg	50cd8d995b	display value map or range map	2018-12-12 11:04:34 +01:00
Marcus Efraimsson	b9e91cab0e	add oauth_auto_login setting to defaults file ... Making the setting configurable thru environment variable	2018-12-12 10:42:37 +01:00
Torkel Ödegaard	7161b2dc9b	wip	2018-12-12 09:51:17 +01:00
Torkel Ödegaard	8497c854f6	Adding mixed query	2018-12-12 08:54:12 +01:00
Peter Holmberg	29bcdef104	Check with lowercase	2018-12-12 08:47:08 +01:00
Torkel Ödegaard	87e6f86f87	wip metrics tab changes	2018-12-12 08:33:49 +01:00
bergquist	ed2a9b8e73	changelog: adds note about closing #13754	2018-12-12 08:08:30 +01:00
Torkel Ödegaard	3452ee5a9c	wip: making things work again	2018-12-12 06:52:08 +01:00
Torkel Ödegaard	fa4fddf7b5	React-select refactorings	2018-12-11 22:17:32 +01:00
Torkel Ödegaard	1d7d72b49d	wip: react select css refactoring	2018-12-11 18:49:48 +01:00
Daniel Lee	ee275cf2dc	Merge pull request #14453 from grafana/readme-explore-link-fix ... docs: fix broken link on explore page	2018-12-11 17:26:51 +01:00
Daniel Lee	46565efc04	docs: fix broken link on explore page	2018-12-11 17:17:01 +01:00
Torkel Ödegaard	d998527128	wip	2018-12-11 17:03:38 +01:00
Daniel Lee	d7ba9c1a54	Merge pull request #14325 from grafana/docs-explore ... WIP docs for the new Explore feature	2018-12-11 16:45:35 +01:00
Torkel Ödegaard	45fde57ef9	Merge branch 'develop' into metrics-tab-changes	2018-12-11 16:45:04 +01:00
Torkel Ödegaard	b0c014bf24	Merge branch 'develop' of github.com:grafana/grafana into develop	2018-12-11 16:44:52 +01:00
Peter Holmberg	f7cb5a1fd5	changing type and started on Gauge	2018-12-11 16:44:42 +01:00
Torkel Ödegaard	4dbfcde782	Merge pull request #14446 from grafana/14274-develop-viz-keynav ... Change KeyboardNavigation HOC to a component with render prop instead	2018-12-11 16:44:30 +01:00
Peter Holmberg	0ba75a88a5	fix threshold test	2018-12-11 16:06:36 +01:00
Peter Holmberg	5f7bc13678	Adding label	2018-12-11 15:58:48 +01:00
Peter Holmberg	6ab93982ae	styling on dropdowns	2018-12-11 15:47:30 +01:00
Torkel Ödegaard	076a1be03a	Merge pull request #14449 from grafana/14437-tag-filter ... Filter tags select box on text input #14437	2018-12-11 15:21:51 +01:00
Peter Holmberg	c2b1f504a0	Merge remote-tracking branch 'origin/develop' into gauge-value-mappings	2018-12-11 15:19:28 +01:00
Peter Holmberg	346f5f2595	Using drop down instead	2018-12-11 15:14:53 +01:00
Johannes Schill	6bb9415b0e	Filter tags select box on text input #14437	2018-12-11 15:04:40 +01:00
Peter Holmberg	db87c5126b	fixed id bug	2018-12-11 14:45:18 +01:00
Peter Holmberg	ddf080dab6	Using an id to identify mappings	2018-12-11 14:17:58 +01:00