18835 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	c0fc236fcb	Merge pull request #14535 from grafana/react-graph-changes ... React graph changes	2018-12-17 16:29:00 +01:00
Torkel Ödegaard	c20e10a584	Merge branch 'master' into 14409/threshold-ux-changes	2018-12-17 16:25:33 +01:00
Torkel Ödegaard	0fe452ec26	Minor react graph panel refactorings and fixes	2018-12-17 15:38:51 +01:00
Torkel Ödegaard	cfae98fae2	Merge pull request #14532 from grafana/fixes-to-user-and-team-picker ... Fixes issues with user and team picker	2018-12-17 14:56:05 +01:00
Peter Holmberg	adebbd9559	sorting tests for change value	2018-12-17 14:37:12 +01:00
Torkel Ödegaard	e80a287f7a	Merge pull request #14510 from grafana/14484-table-format-string-epochs ... In Table Panel, renders epoch string as date if date column style	2018-12-17 14:37:00 +01:00
Torkel Ödegaard	e38a04ba9a	Fixes issues with user and team picker	2018-12-17 14:31:43 +01:00
Peter Holmberg	e7f966d002	fixing coloring	2018-12-17 14:26:19 +01:00
bergquist	17f8be90ae	upgrade to golang 1.11.4	2018-12-17 14:25:47 +01:00
Peter Holmberg	98490084a1	remove printed index	2018-12-17 14:18:28 +01:00
Peter Holmberg	e11834e950	updating test	2018-12-17 14:16:29 +01:00
Peter Holmberg	ade2f297a7	adding threshold	2018-12-17 14:15:04 +01:00
Torkel Ödegaard	0fd92ef6fb	Refactoring react graph	2018-12-17 13:55:25 +01:00
Torkel Ödegaard	3efaf52049	Merge pull request #14274 from grafana/develop ... Develop (New Panel Edit UX & Explore All Datasources suppport) -> Master	2018-12-17 13:35:59 +01:00
Torkel Ödegaard	1ac81c3ad0	updated dropdown typeahead to place down instead of up, works better when inside scrollable area	2018-12-17 13:08:09 +01:00
Torkel Ödegaard	7455dfcc84	minor style tweak	2018-12-17 12:57:40 +01:00
Erik Sundell	f673d60dae	Merge branch 'develop' of https://github.com/grafana/grafana into develop	2018-12-17 11:17:58 +01:00
Erik Sundell	e84e6740e6	propagate initial state back to explore query runner	2018-12-17 11:17:16 +01:00
Torkel Ödegaard	d912677d80	Merge pull request #14520 from Soitora/patch-1 ... OAuth Title Fix	2018-12-17 07:22:48 +01:00
Simon Mattila	c4126f9910	Update gitlab.md ... Change title from Google to GitLab	2018-12-17 00:26:23 +01:00
Simon Mattila	5d190769e6	Update github.md ... Change title from Google to GitHub	2018-12-17 00:24:52 +01:00
Torkel Ödegaard	d7e5582c76	minor style fixes	2018-12-16 10:31:37 -08:00
Torkel Ödegaard	e6b8bfe7e6	Updated snapshot	2018-12-16 10:10:25 +01:00
Torkel Ödegaard	72b9cb9b9f	Switched to react-select fork	2018-12-16 09:58:37 +01:00
Torkel Ödegaard	660c9fd467	Merge branch 'develop' of github.com:grafana/grafana into develop	2018-12-16 09:21:15 +01:00
Daniel Lee	167e8815d3	ldap: upgrades go-ldap to v3	2018-12-16 01:05:14 +01:00
Daniel Lee	0ebd5e0c80	table: fixes #14484. Renders epoch string if date column style	2018-12-16 00:03:03 +01:00
Daniel Lee	217596b4a1	changelog: adds note for #14483	2018-12-16 00:01:56 +01:00
Torkel Ödegaard	38b5d7862f	Fix for no metrics panels, now goes to viz tab and does not show queries tab	2018-12-15 12:08:33 -08:00
Torkel Ödegaard	e99dbefb98	minor style fix	2018-12-15 11:29:50 -08:00
Torkel Ödegaard	1b3a520b94	minor change to table panel edit options	2018-12-15 18:09:18 +01:00
Torkel Ödegaard	68b7b6cd97	minor tweaks to text panel	2018-12-15 17:53:52 +01:00
Torkel Ödegaard	f67e0827b2	Fixes and cleanup	2018-12-15 10:04:25 +01:00
Simon Podlipsky	2d296715ec	Show predefined time ranges as first in timepicker on small screens	2018-12-15 00:55:24 +01:00
Torkel Ödegaard	9773a2d419	Merge pull request #14502 from banjeremy/13765-annotation-editor-outside-viewport ... remove check on axis.used in flot	2018-12-14 21:33:40 +01:00
Torkel Ödegaard	248015c937	code cleanup in add panel, and switched off grid css transforms to fix z-index issuse	2018-12-14 20:53:42 +01:00
Torkel Ödegaard	bd2c9853ec	minor tweaks to alert tab	2018-12-14 19:34:51 +01:00
Torkel Ödegaard	b10f558a99	fixed name of alert tab	2018-12-14 17:45:35 +01:00
Torkel Ödegaard	2cf246f946	removed unnessary test	2018-12-14 17:42:14 +01:00
Torkel Ödegaard	9ac11f1d9d	updated add panel a bit	2018-12-14 17:39:33 +01:00
Torkel Ödegaard	9d8d5b18ef	Merge remote-tracking branch 'origin/develop-addpanelpanel' into add-panel-rewrite	2018-12-14 17:04:33 +01:00
Torkel Ödegaard	b15bb4fb95	Merge remote-tracking branch 'origin/master' into develop	2018-12-14 17:02:08 +01:00
Torkel Ödegaard	cf1cd4d60f	Merge pull request #14500 from grafana/select-refactor ... Select refactor	2018-12-14 16:57:38 +01:00
Torkel Ödegaard	6e2f6701ac	minor style fix	2018-12-14 16:48:13 +01:00
Torkel Ödegaard	beff16bc8d	updated snapshot	2018-12-14 16:38:52 +01:00
Torkel Ödegaard	677eb6d179	fixes to unit picker	2018-12-14 16:27:48 +01:00
Peter Holmberg	7c83d7ba82	updates on thresholds component	2018-12-14 16:27:42 +01:00
Jeremy Jones	8d8ef8f97f	remove check on axis.used in flot #13765	2018-12-14 09:04:47 -06:00
Torkel Ödegaard	84df0e2dde	Added custom scrollbar to select component	2018-12-14 15:25:49 +01:00
ijin08	3c059bc9d6	removed a test that isn't neccessery any more	2018-12-14 14:50:46 +01:00