6393 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	b56a2c14bb	Merge pull request #4161 from godfreyhe/fix_bug_getAggregators ... fix bug: can't get the aggregators from opentsdb server	2016-02-28 07:52:02 +01:00
Torkel Ödegaard	62d703fdf7	fix(snapshots): fixed share nav link in snapshots, fixes #4172	2016-02-28 07:39:24 +01:00
Torkel Ödegaard	f29899e566	Merge branch 'master' of github.com:grafana/grafana	2016-02-28 07:29:09 +01:00
Torkel Ödegaard	9cebcc45c1	fix(unsaved changes): fix for unsaved changes warning when changing time range to relative rime range, #4176	2016-02-28 07:28:55 +01:00
Mitsuhiro Tanda	3125177e5c	(prometheus) fix label_values() templating	2016-02-28 13:33:29 +09:00
godfreyhe	7810413699	use ES6 arrow function instead of self var on getAggregators	2016-02-28 11:48:54 +08:00
Torkel Ödegaard	261db14c4b	Merge pull request #4169 from utkarshcmu/nav-fix ... Playlist nav fix	2016-02-27 09:49:29 +01:00
utkarshcmu	16783bff16	Playlist nav fix	2016-02-27 00:40:39 -08:00
Torkel Ödegaard	352cdc137d	fix(ux): fixed select box appearance in firefox, fixes #4168	2016-02-27 07:12:05 +01:00
Torkel Ödegaard	bd2e1ef67e	feat(plugins): fixed failing api test	2016-02-26 20:27:29 +01:00
Torkel Ödegaard	7f970bbc7b	ux(): mini polish to forms, reducing padding between checkbox and label	2016-02-26 19:06:35 +01:00
Torkel Ödegaard	35609fe3d1	ux(): mini fix to alert close btn	2016-02-26 18:59:24 +01:00
Torkel Ödegaard	4fcca7c61b	Merge branch 'plugins-list-and-edit-view'	2016-02-26 18:55:33 +01:00
Torkel Ödegaard	d55dc92502	feat(plugins): restored config view functionality to plugin page	2016-02-26 18:55:17 +01:00
Torkel Ödegaard	c148d89004	feat(plugins): progress on plugins page	2016-02-26 18:25:39 +01:00
godfreyhe	8e7a127792	fix bug: can't get the aggregators from opentsdb server	2016-02-26 20:47:22 +08:00
bergquist	6afe2c4e9f	ux(influxdb): query options minor changes	2016-02-26 13:25:31 +01:00
bergquist	be69e2c02c	ux(influxdb): tight-form -> gf-form	2016-02-26 11:58:59 +01:00
bergquist	e3be9f7fe9	ux(graph): widen input in general tab	2016-02-26 11:36:23 +01:00
bergquist	ca3cb07fcb	ux(settings_meta): add space to fill empty labels	2016-02-26 11:33:19 +01:00
Torkel Ödegaard	b98e5690eb	ux(): sidemenu, fix to hide subnav menu when you click on hover subnav items	2016-02-26 10:22:06 +01:00
Mitsuhiro Tanda	45e6187c1a	add hide template variable option	2016-02-26 00:43:48 +09:00
Torkel Ödegaard	c521182ceb	feat(plugins): more work on plugins list/edit view	2016-02-25 15:56:28 +01:00
bergquist	83662b5195	Merge branch 'master' of github.com:grafana/grafana	2016-02-25 15:05:20 +01:00
Torkel Ödegaard	8db7cf49a6	feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins	2016-02-25 14:55:31 +01:00
Torkel Ödegaard	30f3b55baf	fix(prometheus): set default templating format to pipe	2016-02-25 10:26:07 +01:00
bergquist	8750ba94c8	fix(docker): rename docker-compose build file	2016-02-25 10:18:48 +01:00
Torkel Ödegaard	b5beac879e	Merge branch 'matt-tab-style-tweaks'	2016-02-25 09:32:06 +01:00
Torkel Ödegaard	e8b6995cc7	ux(): form tweaks	2016-02-25 09:28:58 +01:00
Matt	7ca8db15d9	Removed commented out old code	2016-02-25 12:36:03 +11:00
Matt	9d96382ecc	Reduced height of tabs and nav-tabs elsewhere	2016-02-25 12:30:36 +11:00
Matt	b86b8965f1	Reduced the heigh of the tabs, adjusted padding on h3	2016-02-25 12:05:19 +11:00
Torkel Ödegaard	f6c49daaa6	Merge branch 'master' of github.com:grafana/grafana	2016-02-24 19:33:08 +01:00
Torkel Ödegaard	a129a6192a	ux(): fixed hight of top navbar	2016-02-24 18:34:31 +01:00
Torkel Ödegaard	22ae259cf5	ux(): varios tweaks and polish	2016-02-24 17:49:08 +01:00
Torkel Ödegaard	e627820d3d	ux(): padding / margin tweaks and polish	2016-02-24 17:06:02 +01:00
bergquist	65711f4bfe	ux(settings_meta): move create new button to bottom of page	2016-02-24 16:01:28 +01:00
bergquist	4531f39c30	ux(settings_rows): move create new button to bottom of page	2016-02-24 15:55:50 +01:00
bergquist	3db1188444	ux(templates): move create new button to bottom of page	2016-02-24 15:18:08 +01:00
bergquist	be3d38ac92	ux(annotations): move create new button to bottom of page	2016-02-24 15:07:34 +01:00
bergquist	b490bdfe33	ux(row_editor): tight-form -> gf-form	2016-02-24 13:49:42 +01:00
Carl Bergquist	95725e407e	Merge pull request #4137 from tinyspeck/fix-debian-bin-path ... Fix the path to grafana-webserver in the Debian install docs.	2016-02-24 12:26:37 +01:00
bergquist	f6457a2023	ux(templating): tight-form -> gf-form	2016-02-24 11:56:45 +01:00
bergquist	7dcb85010a	ux(annotations): change to new tab header	2016-02-24 11:19:09 +01:00
bergquist	0525bf5d4e	ux(table): tight-form -> gf-form	2016-02-24 10:42:53 +01:00
Torkel Ödegaard	7207068181	ux(): worked more on new tabs view	2016-02-24 10:32:22 +01:00
bergquist	59d2fe8aa4	ux(dashlist_options): tight-form -> gf-form	2016-02-24 10:09:12 +01:00
Daniel Lee	be92c8bde1	chore(docker): rename fig.yml to docker-compose.yml ... Support for the old fig.yml file standard has been removed in newer versions of docker-compose.	2016-02-24 09:56:57 +01:00
bergquist	a3e22091be	ux(submenu): tight-form -> gf-form	2016-02-24 08:32:09 +01:00
bergquist	17b7dfb27b	ux(api-keys): tight-form -> gf-form	2016-02-24 07:33:04 +01:00