5477 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	f6a3b53fb5	fix(firefox): fixed js issue that made master build break in firefox	2016-01-15 11:23:08 +01:00
bergquist	01d47fb280	fix(plugins): fix for default plugin dif	2016-01-15 11:22:41 +01:00
bergquist	83346a29aa	fix(plugins): scans default plugin path	2016-01-15 11:01:56 +01:00
Torkel Ödegaard	317c5ba88d	Merge pull request #3747 from utkarshcmu/api-docs ... Added Orgs API docs	2016-01-15 07:51:42 +01:00
utkarshcmu	caa26f594e	Added Orgs API	2016-01-14 14:40:12 -08:00
Torkel Ödegaard	2ccc19185c	fix(text panel): fix for text panel in optimized builds, introduced in recent commit due to plugin api changes	2016-01-14 19:14:02 +01:00
Torkel Ödegaard	b4d595e561	feat(plugins): updated changelog with notice about plugin api changes	2016-01-14 19:01:13 +01:00
Torkel Ödegaard	88a132b878	Merge branch 'dynamic-directives'	2016-01-14 18:57:34 +01:00
Torkel Ödegaard	b5726a8d5a	feat(plugins): completed upgrade of all built in panels	2016-01-14 18:57:02 +01:00
Torkel Ödegaard	b7f4a5c198	Merge pull request #3744 from utkarshcmu/meta-changelog ... Updating CHANGELOG.md	2016-01-14 18:32:57 +01:00
Torkel Ödegaard	1d9ad9be33	feat(plugins): upgraded singlestat to new plugin format	2016-01-14 17:20:50 +01:00
Utkarsh Bhatnagar	2b7a26dabd	Update CHANGELOG.md	2016-01-14 07:53:42 -08:00
Torkel Ödegaard	a233570777	feat(plugins): upgraded opentsdb and prometheus to new plugin module return format	2016-01-14 16:01:17 +01:00
Torkel Ödegaard	6fae264222	feat(plugins): upgraded influxdb to new plugin format	2016-01-14 15:35:14 +01:00
Torkel Ödegaard	8699d49f93	feat(plugins): updated cloudwatch to new plugin style	2016-01-14 15:15:45 +01:00
Torkel Ödegaard	c4ce3293a2	feat(plugins): now solved all cases of loading plugin directives, now just have to upgrade all panels and data sources	2016-01-14 14:37:04 +01:00
Torkel Ödegaard	dbafc8c9db	feat(plugins): work on plugin directive loading	2016-01-14 13:21:05 +01:00
Torkel Ödegaard	6c6c3a5081	feat(plugins): more work on how plugins expose directives	2016-01-14 12:35:31 +01:00
Torkel Ödegaard	d420cb38d1	feat(plugins): work on plugin directives loading	2016-01-14 11:21:56 +01:00
Torkel Ödegaard	b55f8215ec	feat(apps): work on plugin directives loading	2016-01-13 22:31:29 +01:00
Torkel Ödegaard	08caf4bbde	feat(tslint): more tslint work	2016-01-13 21:22:39 +01:00
Torkel Ödegaard	59c928acc2	feat(tslint): added more tslint rules	2016-01-13 21:07:57 +01:00
Torkel Ödegaard	e38e8c740f	Merge pull request #3723 from schen59/master-schen ... fix mismatch api path introduced by commit to issue #3600	2016-01-13 19:51:56 +01:00
Shaofeng Chen	4ceab4abc7	fix mismatch api path	2016-01-13 10:44:31 -08:00
Torkel Ödegaard	8ff48c126a	fix(merge): minor merge fix	2016-01-13 15:51:47 +01:00
Torkel Ödegaard	6da3af5e89	Merge branch 'new_macaron'	2016-01-13 15:48:49 +01:00
Torkel Ödegaard	77c362af8d	fix(sidemenu): added missing login link	2016-01-13 15:48:12 +01:00
Torkel Ödegaard	2cf0dc2cb2	fix(gofmt): fixed non formated go file	2016-01-13 15:43:32 +01:00
Torkel Ödegaard	bdb67d4909	fix(build): fixed dependency and build issue	2016-01-13 15:38:54 +01:00
bergquist	4fe72ebf69	feat(macaron): upgrades macaron version	2016-01-13 15:11:23 +01:00
Torkel Ödegaard	49fdf8427a	fix(png rendering): removed --ssl-protocol=any phantomjs param	2016-01-13 15:07:03 +01:00
Torkel Ödegaard	534bc83173	temp work on dynamic directives	2016-01-13 14:03:50 +01:00
Torkel Ödegaard	87f6d7da11	Merge branch 'master' of github.com:grafana/grafana	2016-01-13 13:57:37 +01:00
Torkel Ödegaard	cdd341af64	feat(packaging): added Restart=on-failure to systemd service spec file	2016-01-13 13:57:22 +01:00
Torkel Ödegaard	f70252f013	Merge pull request #3661 from mtanda/prometheus_fill_null ... (prometheus) fill null for missing data point	2016-01-13 11:03:34 +01:00
Torkel Ödegaard	ed989ecc8d	Merge branch 'master' of github.com:grafana/grafana	2016-01-13 10:40:58 +01:00
Torkel Ödegaard	a147015e96	fix(playlists): fixed url in playlist view when using sub url, fixes #3711	2016-01-13 10:36:00 +01:00
Carl Bergquist	8cf7fb7f80	Merge pull request #3712 from schen59/master-schen ... add get org by name api (issue #3600)	2016-01-13 08:40:44 +01:00
Mitsuhiro Tanda	c317149a08	add test for prometheus fill null	2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda	ff8b25a50a	fix, should fill null at end timestamp	2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda	afa539368f	fill null in Prometheus	2016-01-13 15:59:59 +09:00
Shaofeng Chen	dc427d5a2c	add get org by name api	2016-01-12 13:50:56 -08:00
Torkel Ödegaard	a87b5f757d	fix(datasources): minor fix to data sources after apps branch merge	2016-01-12 20:05:40 +01:00
bergquist	4db57cc0bb	docs(playlists): add persisted playlists to changelog	2016-01-12 17:08:13 +01:00
Torkel Ödegaard	44f0242157	fix(build): fixed issue after merge	2016-01-12 15:45:55 +01:00
Torkel Ödegaard	e5b3f27a30	Merge branch 'apps'	2016-01-12 15:41:15 +01:00
Torkel Ödegaard	a15984b663	feat(apps): pages work	2016-01-12 15:39:29 +01:00
Carl Bergquist	f7fecdc6de	Merge pull request #3655 from grafana/playlist ... Persistable playlists closes #515 closes #1137	2016-01-12 15:20:43 +01:00
bergquist	cabefa4fff	fix(playlist): fix for timespan -> interval	2016-01-12 14:38:14 +01:00
bergquist	1ec97e5199	feat(playlist): shortens urls	2016-01-12 14:36:04 +01:00