5342 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	ae6cae0771	Merge branch 'master' of github.com:grafana/grafana	2016-01-12 10:32:49 +01:00
Torkel Ödegaard	2b99b64ec5	fix(table panel): fixed issue with table panel in optimized builds, closes #3702	2016-01-12 10:32:19 +01:00
Torkel Ödegaard	16cd27282f	Merge pull request #3686 from keis/phantomjs-dependency ... Add missing peer dependency: phantomjs	2016-01-11 18:46:10 +01:00
Torkel Ödegaard	882980ada7	changelog: updated with info about #3635	2016-01-11 16:39:22 +01:00
Torkel Ödegaard	66f7a2be15	Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation	2016-01-11 16:35:45 +01:00
Torkel Ödegaard	908b2d151f	Merge pull request #3681 from byronmwong/master ... Fix elasticsearch hourly indexes	2016-01-11 16:29:46 +01:00
Mitsuhiro Tanda	d3bc52278d	annotation snapshot fix	2016-01-11 19:26:48 +09:00
Mitsuhiro Tanda	012d1378d4	snapshot annotation	2016-01-11 19:26:48 +09:00
Torkel Ödegaard	a9aaa5ad73	Merge branch 'master' of github.com:grafana/grafana	2016-01-08 18:01:20 +01:00
Torkel Ödegaard	6c1fee736b	feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687	2016-01-08 17:58:46 +01:00
Torkel Ödegaard	f81d2595f9	Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation	2016-01-08 16:29:10 +01:00
David Keijser	1896bd0920	Add missing peer dependency: phantomjs	2016-01-08 16:27:43 +01:00
Torkel Ödegaard	183f32390c	Merge pull request #3683 from mtanda/cloudwatch_reuse_credentials ... (cloudwatch) reuse credentials	2016-01-08 16:25:27 +01:00
bergquist	d0841919ea	docs(plugins): fixes typo	2016-01-08 10:55:22 +01:00
bergquist	a23e60ab69	docs(plugins): adds plugin page	2016-01-08 10:53:39 +01:00
Carl Bergquist	ab30297d02	Merge pull request #3679 from volter/colored-bolt ... Color the annotation bolt (#3590) closes #3590	2016-01-08 10:51:29 +01:00
Torkel Ödegaard	3362d6bc56	Merge branch 'docs-2.6'	2016-01-08 10:25:20 +01:00
Torkel Ödegaard	e5f391ab53	docs: minor change to docs make file	2016-01-08 10:24:58 +01:00
Torkel Ödegaard	19a5e425cf	docs: fixed building from source go dependency verison	2016-01-08 10:22:57 +01:00
Mitsuhiro Tanda	f84737d7d4	(cloudwatch) reuse credentials	2016-01-08 18:13:36 +09:00
Nick Christus	0ee0ea554d	sidebar-consolidation: added new org menu to sidebar	2016-01-07 22:49:14 -06:00
Byron	40845578c6	Fix elasticsearch hourly indexes	2016-01-07 14:39:20 -08:00
Volker Fröhlich	f4e22e49b6	Color the annotation bolt (#3590) ... Makes it easier to distinguish between annotations while editing and using them; Uses the icon color.	2016-01-07 22:28:03 +01:00
Torkel Ödegaard	8a2af9b818	Merge branch 'v2.6.x'	2016-01-07 22:00:21 +01:00
Torkel Ödegaard	255901ca7c	fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554	2016-01-07 21:59:55 +01:00
Torkel Ödegaard	52644bb28a	fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs	2016-01-07 20:52:48 +01:00
bergquist	7cad3c89d3	Merge branch 'hcooper-hover-order'	2016-01-07 18:10:42 +01:00
bergquist	bcdddfe4e8	style(tooltip): removed comment and extrated sort	2016-01-07 18:09:51 +01:00
bergquist	c4ca1444f9	Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order	2016-01-07 17:43:04 +01:00
bergquist	f5565d4814	docs(changelog): add note about ssl support for mysql	2016-01-07 17:39:25 +01:00
bergquist	f20ee6b482	Merge branch 'improbable-io-ssl-for-mysql'	2016-01-07 17:09:14 +01:00
bergquist	6c8d084664	Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql	2016-01-07 17:08:31 +01:00
bergquist	5792a16222	fix(plugins): removes warnings for missing folder ... Remove warnings when scanning for plugins in the default catalog data/plugins closes #3663	2016-01-07 08:51:31 +01:00
bergquist	9343b0378d	feat(plugins): adds warn log for scanning folders ... symlinks outside to plugin folder can cause problems. This commit makes sure to warn about it in the logs	2016-01-06 11:57:17 +01:00
bergquist	5de69b288f	feat(singlestat): make sparkline height dynamic ... closes #3553	2016-01-05 19:21:12 +01:00
Carl Bergquist	5c0812ab6f	Merge pull request #3636 from henridf/docs-es-filter-in-template ... Docs: add example with filter in ES template	2016-01-05 08:58:26 +01:00
Henri DF	5af3fe93f2	Docs: add example with filter in ES template	2016-01-04 21:48:47 -08:00
Carl Bergquist	09b8401324	Merge pull request #3624 from mtanda/prometheus_link_fix ... (prometheus) fix Prometheus link	2016-01-04 17:43:55 +01:00
Carl Bergquist	03c10ef885	Merge pull request #3626 from aqnouch/patch-1 ... Updated copyright to 2016	2016-01-04 07:54:22 +01:00
AQNOUCH Mohammed	cc1ed98fc4	Updated copyright to 2016	2016-01-01 01:30:43 +00:00
Mitsuhiro Tanda	ebf0bd5fc9	fix end time of Prometheus link	2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda	be48caf59f	fix Prometheus link, expand template variable in expression	2015-12-31 16:05:04 +09:00
Qtax	c0cf0cb802	Added an option to set a min-width for the graphs side table/area.	2015-12-29 14:42:52 +01:00
Carl Bergquist	311624beaa	Merge pull request #3598 from eddawley/ISSUE-2818 ... Fixes #2818. Adds support for mysql backends via unix sockets	2015-12-28 10:33:49 +01:00
Torkel Ödegaard	69eb62c09f	Merge pull request #3597 from eddawley/ISSUE-3461 ... Issue 3461: Session table is now created automatically	2015-12-24 09:59:34 +01:00
Ed Dawley	ec36e28368	Small typo in comment	2015-12-23 15:15:59 -06:00
Ed Dawley	4da56b65ab	Fixes #2818. Adds support for mysql backends via unix sockets	2015-12-23 15:06:28 -06:00
Ed Dawley	cd23ab9955	Issue 3461: Session table is now created automatically	2015-12-23 01:33:46 -06:00
Daniel Low	3f9f0679ec	gofmt	2015-12-22 13:10:34 +00:00
Torkel Ödegaard	f074c1eaff	refactor(lodash): changed how lodash is referenced from typescript	2015-12-22 13:59:11 +01:00