20754 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schill	f3dbdfac07	fix: Make sure we dont add &autofitpanels to the url if it already exists #15849	2019-03-07 10:32:36 +01:00
Torkel Ödegaard	a826c117e2	Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist ... Revert "Fix for leaving playlist mode"	2019-03-07 08:46:14 +01:00
Torkel Ödegaard	12263a3f70	Merge pull request #15838 from aocenas/fix-new-datasource-search ... Fix new datasource search input	2019-03-07 08:45:52 +01:00
Torkel Ödegaard	327d1d758d	Merge pull request #15841 from ryantxu/fix-15840 ... return the same panelData unless it changes	2019-03-07 08:44:18 +01:00
Marcus Efraimsson	10d50ea728	Merge pull request #15845 from shafferjohn/patch-1 ... Update upgrading.md for wrong spell	2019-03-07 08:29:42 +01:00
Shaffer John	272b561958	Update upgrading.md for wrong spell	2019-03-07 11:09:17 +08:00
ryan	2e8dd19636	use pure component	2019-03-06 15:54:19 -08:00
ryan	627a32e9bb	Merge remote-tracking branch 'grafana/master' into alpha-text2 ... * grafana/master: (40 commits) Minor refactoring of PR #15770 Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702 fix discord notifier so it doesn't crash when there are no image generated fix: Consistency in unit labels #15709 Update latest.json Update CHANGELOG.md position from add panel, dimensions from copied panel changelog: add notes about closing #14509 #15179 fix: Add class for input fields with help icon to avoid icon hiding the text #15771 Update CHANGELOG.md restore to current folder when restoring old dashboard version fix(renderer): Vendor ansicolor as typescript log phantomjs output even if it timeout and include orgId when render alert keep size from copied panel and not from add panel widget Added basic cherry pick helping task Prevent search in VizPicker from stealing focus (#15802) fix only users that can edit a dashboard should be able to update panel json Updated changelog task Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631 Updated to add PR author, skip PR issue references ...	2019-03-06 15:47:14 -08:00
ryan	82326fed42	return the same panelData unless it changes	2019-03-06 15:18:24 -08:00
Andrej Ocenas	a59e0f1b55	Map dataSourceTypeSearchQuery state from redux to search input.	2019-03-06 22:30:40 +01:00
Torkel Ödegaard	bc2a798158	Merge pull request #15574 from grafana/more-color-variables-use-variables ... Changed some more color variables to use variables	2019-03-06 18:07:42 +01:00
Torkel Ödegaard	1ab548f423	Merge pull request #15832 from grafana/stop-playlist ... Alternative fix to detecting when to stop a playlist	2019-03-06 17:57:37 +01:00
Torkel Ödegaard	2604e9e433	Minor refactoring of PR #15770	2019-03-06 17:53:14 +01:00
Torkel Ödegaard	18d5c04ae4	Merge branch 'toggle-all-legends' of https://github.com/jsferrei/grafana into jsferrei-toggle-all-legends	2019-03-06 17:48:59 +01:00
Torkel Ödegaard	3895294f97	Revert "Fix for leaving playlist mode"	2019-03-06 17:39:18 +01:00
Torkel Ödegaard	64a7d8cefe	Merge pull request #15833 from grafana/15694_fix ... fix discord notifier so it doesn't crash when there are no image generated	2019-03-06 17:32:34 +01:00
Torkel Ödegaard	3375c72d56	Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702	2019-03-06 17:30:57 +01:00
Torkel Ödegaard	878b41d666	Merge pull request #15822 from grafana/copy-panel-retain-size ... Keep size from copied panel	2019-03-06 17:06:19 +01:00
Torkel Ödegaard	d4c337b152	Merge pull request #15830 from grafana/15709-bytes-sec-label ... fix: Consistency in unit labels #15709	2019-03-06 17:05:40 +01:00
Marcus Efraimsson	f21c976b27	fix discord notifier so it doesn't crash when there are no image generated	2019-03-06 17:03:14 +01:00
Johannes Schill	03e0e1783d	fix: Consistency in unit labels #15709	2019-03-06 16:24:49 +01:00
Hugo Häggmark	c2598e498a	Update latest.json	2019-03-06 16:10:49 +01:00
Hugo Häggmark	bfde2cb46f	Update CHANGELOG.md	2019-03-06 16:01:22 +01:00
Torkel Ödegaard	71311b1e79	Merge pull request #15827 from grafana/12926_fix ... Fix restore to current folder when restoring old dashboard version	2019-03-06 15:38:06 +01:00
Torkel Ödegaard	8e51667371	Merge pull request #15828 from grafana/15771-datasource-url-icon ... Add padding to all input fields with help icon	2019-03-06 15:37:02 +01:00
Peter Holmberg	2c1be2c37e	position from add panel, dimensions from copied panel	2019-03-06 15:19:58 +01:00
Torkel Ödegaard	8ba4eb47e7	Merge pull request #15769 from grafana/15768_xorm_upgrade ... upgrade xorm packages to latest versions	2019-03-06 15:11:06 +01:00
Torkel Ödegaard	73980adb17	Merge pull request #15826 from grafana/davkal/15635-vendor-ansicolor-ts ... fix(renderer): Vendor ansicolor as typescript	2019-03-06 15:06:46 +01:00
Marcus Efraimsson	b63ef54088	changelog: add notes about closing #14509 #15179	2019-03-06 14:49:36 +01:00
Johannes Schill	e7297fef06	fix: Add class for input fields with help icon to avoid icon hiding the text #15771	2019-03-06 14:45:13 +01:00
Torkel Ödegaard	f22f1ac3d6	Update CHANGELOG.md	2019-03-06 14:41:05 +01:00
Marcus Efraimsson	cf500f3157	restore to current folder when restoring old dashboard version	2019-03-06 14:38:40 +01:00
Torkel Ödegaard	08be3b16e3	Merge pull request #15819 from grafana/phantomjs_fixes ... log phantomjs output even if it timeout and include orgId when render alert	2019-03-06 14:27:54 +01:00
David Kaltschmidt	26236b4bc3	fix(renderer): Vendor ansicolor as typescript ... Fixes #15635 Importing ansicolor from node_modules or vendored as is failed because there is no ES5 transpiler configured for ES6 libs. - remove ansicolor from package.json - add ansicolor to public/vendor/ansicolor and port to typescript - adapt all ansicolor imports - add `public/vendor` as a path to be considered by ts compiler	2019-03-06 14:22:59 +01:00
Marcus Efraimsson	1323043bd4	Merge pull request #15805 from grafana/15667_fix ... fix only users that can edit a dashboard should be able to update panel json	2019-03-06 13:56:49 +01:00
Marcus Efraimsson	36f3accf0d	log phantomjs output even if it timeout and include orgId when render alert	2019-03-06 13:53:23 +01:00
Torkel Ödegaard	63e7330fa0	Merge remote-tracking branch 'origin/cli/refactor-commands'	2019-03-06 13:32:16 +01:00
Torkel Ödegaard	aef09fe1df	Merge pull request #15801 from grafana/changelog-cli-task ... Added first iteration/poc of changelog task	2019-03-06 13:30:27 +01:00
Torkel Ödegaard	e9e2c85a72	Merge pull request #15818 from grafana/fix-15631-rendering-timeout ... Fixed image rendering issue for dashboards with auto refresh, Fixes #15631	2019-03-06 13:29:18 +01:00
Peter Holmberg	db2b8ea602	keep size from copied panel and not from add panel widget	2019-03-06 13:23:11 +01:00
Torkel Ödegaard	7b67dcfbb8	Added basic cherry pick helping task	2019-03-06 13:18:13 +01:00
Peter Holmberg	4e57ead38d	Prevent search in VizPicker from stealing focus (#15802) ... Fixes #15569 focus issue in viz picker search * added state to not set focus on search every render * move to new component to handle focus	2019-03-06 13:07:08 +01:00
Marcus Efraimsson	1a588dadbe	fix only users that can edit a dashboard should be able to update panel json	2019-03-06 12:57:19 +01:00
Torkel Ödegaard	153b3e5cf5	Updated changelog task	2019-03-06 12:28:07 +01:00
Torkel Ödegaard	70f1abbe37	Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631	2019-03-06 11:46:38 +01:00
Torkel Ödegaard	72d5215c65	Merge pull request #15783 from grafana/cli/refactor-commands ... Minor refactor of cli tasks (core start, @grafana/ui publishing)	2019-03-06 10:36:21 +01:00
Torkel Ödegaard	72ca51dadc	Updated to add PR author, skip PR issue references	2019-03-06 09:57:45 +01:00
Torkel Ödegaard	10ff3db1ab	Added first iteration/poc of changelog task	2019-03-06 09:57:44 +01:00
Dominik Prokop	3fc24fa964	Enable @grafana/ui version bump based on package.json contents	2019-03-06 09:52:31 +01:00
Torkel Ödegaard	85751d9875	Merge pull request #15803 from grafana/15643_fix ... fix allow anonymous initial bind for ldap search	2019-03-06 09:35:37 +01:00