14880 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	8143610024	bus: support multiple dispatch in one transaction ... this makes it possible to run multiple DispatchCtx in one transaction. The TransactionManager will start/end the transaction and pass the dbsession in the context.Context variable	2018-06-15 12:46:20 +02:00
Carl Bergquist	e33d18701d	Merge pull request #12287 from bergquist/fix_12286 ... Influxdb: add mode functions	2018-06-15 12:43:47 +02:00
Marcus Efraimsson	f0254c201a	Merge pull request #12215 from ryantxu/use-ng-if-for-time ... use ng-if for the panel timeInfo	2018-06-15 12:16:48 +02:00
Marcus Efraimsson	a02306bc75	Merge pull request #12295 from bergquist/docker_master ... docs: adds info about grafana-dev container	2018-06-15 11:32:24 +02:00
bergquist	10d840b1cc	docs: adds info about grafana-dev container	2018-06-15 11:07:23 +02:00
Marcus Efraimsson	551957fc4d	changelog: add notes about closing #12282 ... [skip ci]	2018-06-15 10:57:19 +02:00
flopp999	2d1f59a9cc	Added Litre/min and milliLitre/min in Flow (#12282) ... units: Litre/min and milliLitre/min in Flow	2018-06-15 10:54:38 +02:00
Marcus Efraimsson	5f78ad583f	remove papaparse dependency	2018-06-15 10:49:57 +02:00
Marcus Efraimsson	22c7c741eb	Merge pull request #12252 from grafana/davkal/ifql-query ... Internal Influx Flux plugin cleanup	2018-06-15 10:43:34 +02:00
Marcus Efraimsson	b62322b128	Merge pull request #12288 from mlclmj/master ... docs: HTTP Endpoint for Deleting an Organization	2018-06-15 10:37:51 +02:00
Marcus Efraimsson	96287a9061	Merge pull request #12294 from vincent-fuchs/patch-1 ... docs: delete_datasources -> deleteDatasources in provisioning	2018-06-15 10:33:03 +02:00
Vincent Fuchs	c8becf57fa	list name is deleteDatasources, not delete_datasources ... fixes https://github.com/grafana/grafana/issues/12293	2018-06-15 12:19:53 +05:30
David Kaltschmidt	d5196ab322	remove internal influx ifql datasource	2018-06-14 20:42:33 +01:00
Malcolm Jones	2765afc830	Document the endpoint for deleting an org	2018-06-14 15:28:54 -04:00
bergquist	c63533f004	tests: rewrite into table tests	2018-06-14 20:33:36 +02:00
bergquist	bf4ee9bcc6	influxdb: adds mode func to backend ... closes #12286	2018-06-14 20:33:22 +02:00
Marcus Efraimsson	56628996b7	Merge pull request #12280 from dehrax/12224-elastic-response ... karma to jest: 6 test files	2018-06-14 17:24:36 +02:00
Marcus Efraimsson	0107491195	changelog: add notes about closing #11484 ... [skip ci]	2018-06-14 15:59:31 +02:00
Marcus Efraimsson	81d34137a8	Merge pull request #11484 from manacker/master ... alerting: fix mobile notifications for microsoft teams notifier	2018-06-14 15:56:18 +02:00
Marcus Efraimsson	e6135ffd4f	changelog: add notes about closing #11233 ... [skip ci]	2018-06-14 15:39:32 +02:00
Marcus Efraimsson	9dd38031e4	Merge pull request #11233 from flopp999/patch-2 ... units: W/m2(energy), l/h(flow) and kPa(pressure)	2018-06-14 15:36:38 +02:00
Tobias Skarhed	dbbd6b9b66	Remove import	2018-06-14 15:27:11 +02:00
Marcus Efraimsson	1626a66bab	Merge pull request #12275 from dehrax/12224-exporter ... karma to jest: exporter, playlist_edit_ctrl	2018-06-14 15:10:06 +02:00
Marcus Efraimsson	25e1d723c6	Merge pull request #12276 from grafana/davkal/expose-react-slate ... Expose react and slate to external plugins	2018-06-14 14:41:30 +02:00
Tobias Skarhed	23abf044ff	Fix PR feedback	2018-06-14 14:37:48 +02:00
David Kaltschmidt	5ec7d60e5f	Removed papaparse from external plugin exports	2018-06-14 13:22:16 +01:00
Tobias Skarhed	ef0586acab	Karma to Jest: query_builder	2018-06-14 14:20:42 +02:00
Marcus Efraimsson	284045748c	Merge pull request #12243 from grafana/12236-ds-proxy-tokens ... dsproxy: allow multiple access tokens per datasource	2018-06-14 14:03:08 +02:00
Marcus Efraimsson	99c188f626	Merge pull request #12273 from grafana/12247-link-icon ... fix panel link icon positioning	2018-06-14 13:54:08 +02:00
Daniel Lee	10d30f0b73	dsproxy: move http client variable back ... After refactoring to be able to mock the client in a test, the client wasn't a global variable anymore. This change moves the client back to being a package- level variable.	2018-06-14 13:39:46 +02:00
Tobias Skarhed	283b39c397	Karma to Jest: threshold_mapper	2018-06-14 13:38:03 +02:00
David Kaltschmidt	eb686c06f2	Expose react and slate to external plugins ... Experimental support for react in external plugins - react - slate (editor) - papaparse (csv parsing) - prismjs (syntax highlighting) This is needed for new external datasource plugins like Flux	2018-06-14 12:32:57 +01:00
Tobias Skarhed	155ff06cbe	Karma to Jest: threshold_manager	2018-06-14 13:22:17 +02:00
Tobias Skarhed	2465f53324	Karma to Jest: query_def, index_pattern	2018-06-14 12:18:11 +02:00
Tobias Skarhed	a911d36dea	Remove import	2018-06-14 12:00:54 +02:00
Tobias Skarhed	04029a94cd	Karma to Jest: elastic_response	2018-06-14 11:56:03 +02:00
Marcus Efraimsson	71b0326769	Merge pull request #12237 from dehrax/12224-version-panel ... Convert tests from Karma to Jest	2018-06-14 10:13:46 +02:00
Patrick O'Carroll	8345e83bd6	changelog: notes about closing #12189	2018-06-14 10:05:11 +02:00
Patrick O'Carroll	9802d86783	Merge pull request #12189 from ryantxu/focus-panel-search ... autoFocus the add-panel search filter, and add on enter	2018-06-14 09:54:41 +02:00
Tobias Skarhed	a3552a60e1	Improve test readability	2018-06-14 09:46:36 +02:00
Patrick O'Carroll	a0aa0b55e7	moved link icon in panel header	2018-06-14 09:24:51 +02:00
Tobias Skarhed	4dd9b8f324	Karma to Jest: playlist_edit_ctrl	2018-06-13 16:29:50 +02:00
Tobias Skarhed	94b8cbdc6a	Karma to Jest: exporter	2018-06-13 15:15:36 +02:00
nikoalch	0cc8ccdaa5	Update graphite.md	2018-06-13 08:40:15 -04:00
Marcus Efraimsson	ff3db60e2e	changelog: add notes about closing #10796 ... [skip ci]	2018-06-13 13:13:57 +02:00
Marcus Efraimsson	2288e01752	Merge pull request #12169 from alexanderzobnin/feat-10796 ... Import dashboard to folder	2018-06-13 13:10:52 +02:00
Marcus Efraimsson	c39979a557	Merge pull request #12255 from dehrax/docs-dev-grafana ... Update "Building from source" docs	2018-06-13 12:46:45 +02:00
Alexander Zobnin	25504e84ed	dashboard import to folder: minor fixes	2018-06-13 10:44:37 +03:00
Tobias Skarhed	c650b50c37	Docs: output location from build script	2018-06-13 09:37:14 +02:00
Carl Bergquist	d3a3e7cfd1	Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references ... removed QueryOptionsCtrl references	2018-06-13 09:34:02 +02:00