11142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	8d6a1cdbb4	ux: wip	2017-08-14 18:11:35 +02:00
Torkel Ödegaard	78ea1dc87d	ux: new page header look wip	2017-08-14 16:06:20 +02:00
Torkel Ödegaard	8b87964344	ux: testing roboto font	2017-08-14 13:57:16 +02:00
Torkel Ödegaard	f02be0251b	ux: use flexbox for sidenav, put logo in sidenav	2017-08-14 12:26:24 +02:00
Matt Toback	020aae1427	Updated Grafana.net to .com	2017-08-14 11:05:28 +02:00
Torkel Ödegaard	1dab313ca3	Merge branch 'master' into develop	2017-08-14 10:30:36 +02:00
Torkel Ödegaard	17cb3f6e6a	fix: graph fix for decimals, bug introduced by #61313478063b0e0721f204847f3c0298ea8f593f	2017-08-11 16:20:36 +02:00
Torkel Ödegaard	d4dd0222fa	fix: prometheus does not have two editor modes, fixes #9025	2017-08-11 12:33:56 +02:00
Torkel Ödegaard	8f2975c69b	moving panels betwen rows are starting to work	2017-08-11 12:12:17 +02:00
Daniel Lee	167995776f	docs: update to tag alias ... ref #9024	2017-08-11 11:30:30 +02:00
Daniel Lee	02248273ae	mysqlds: remove alpha state from plugin.json	2017-08-11 10:25:37 +02:00
Daniel Lee	c4feef2541	docs: http api /users - corrections + adds missing method	2017-08-11 10:24:54 +02:00
Alexander Zobnin	776e6e2c3f	ace: redefine completions for prometheus and add initial docs for functions	2017-08-10 19:58:59 +03:00
Torkel Ödegaard	9f945578b8	grid: progress on row support	2017-08-10 17:17:15 +02:00
Alexander Zobnin	679ddc9696	ace: example snippet for prometheus	2017-08-10 16:49:09 +03:00
Torkel Ödegaard	61459b287c	grid: new grid fixes	2017-08-10 15:29:40 +02:00
Torkel Ödegaard	7cb6093dba	new-grid: fixed destory issues	2017-08-10 15:08:53 +02:00
Torkel Ödegaard	23666c0f78	grid: remove panel works	2017-08-10 14:54:56 +02:00
Daniel Lee	b716a2595a	mysqlds: add support for key/value template variables ... If the template variable query has two columns named __text and __value then return a list of key values. The value is used when the variable is interpolated in the query. Allows mapping of texts to ids.	2017-08-10 14:42:27 +02:00
Alexander Zobnin	d8d59fd8d4	ace: add custom behaviour for prometheus	2017-08-10 15:28:40 +03:00
Torkel Ödegaard	c7959ff06e	fix: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052	2017-08-10 14:12:31 +02:00
Torkel Ödegaard	d2437d3cf1	fix: ad-hoc filters now works with data source variables, fixes #8052	2017-08-10 12:04:46 +02:00
Alexander Zobnin	b260a642e7	ace: fix broken karma tests (error loading ace.js )	2017-08-10 12:33:53 +03:00
Alexander Zobnin	e75b39376a	ace: minor refactor	2017-08-10 11:53:55 +03:00
Alexander Zobnin	6b5400bdb6	ace: fix loading text snippets error	2017-08-10 11:23:32 +03:00
Torkel Ödegaard	149e694ce6	ace: prometheus completion improvements	2017-08-10 10:08:09 +02:00
Torkel Ödegaard	0b2cc404ff	ace: working on editor completion stuff	2017-08-10 09:33:17 +02:00
Torkel Ödegaard	b9540e4c49	ace: minor ace theme tweaks	2017-08-09 21:12:15 +02:00
Daniel Lee	43fa852cc1	mysql: change logging from into to debug for scan	2017-08-09 19:33:09 +02:00
Daniel Lee	1105bb371f	mysqlds: adds support for template variables ... Fixes #8855	2017-08-09 19:32:53 +02:00
Torkel Ödegaard	8356871636	grid: updated gridstack to use grafana fork	2017-08-09 16:02:00 +02:00
Torkel Ödegaard	a2a4325b6e	Merge branch 'develop-newgrid' of github.com:grafana/grafana into develop-newgrid	2017-08-09 15:35:06 +02:00
Torkel Ödegaard	77b42220f4	feat: new grid fixes	2017-08-09 15:33:19 +02:00
Daniel Lee	59513ff963	tempvar: bug fix for duplicate template var ... and a fix for when selecting the same value twice in a template variable if it is not multi select. It threw an exception on the second selection	2017-08-09 14:28:23 +02:00
Torkel Ödegaard	d25dae9b58	Merge branch 'master' into develop-newgrid	2017-08-09 14:07:06 +02:00
Torkel Ödegaard	459a8ed695	ace: minor changes to ace directive	2017-08-09 11:43:02 +02:00
Torkel Ödegaard	80f5c914e8	ace: removed the old text areas	2017-08-09 11:06:21 +02:00
Torkel Ödegaard	68cac6ccb5	Merge branch 'master' into ace-editor	2017-08-09 10:51:31 +02:00
Torkel Ödegaard	668cb3c1ef	Merge branch 'v4.4.x'	2017-08-09 10:37:06 +02:00
Torkel Ödegaard	e8a20643d6	feat: store last seen date for users and present in stats and user lists, closes #9007	2017-08-09 10:36:41 +02:00
Alexander Zobnin	5c0773023f	code-editor: increase autocomplete popup size	2017-08-09 11:23:05 +03:00
Alexander Zobnin	1c8c746956	code-editor: prometheus metrics autocomplete	2017-08-09 10:58:00 +03:00
Torkel Ödegaard	eac0d30e99	Merge branch 'v4.4.x'	2017-08-09 07:20:52 +02:00
Torkel Ödegaard	26ad025705	feat: added os to stats	2017-08-09 07:20:37 +02:00
Alexander Zobnin	aa670244f1	code-editor: initial prometheus syntax definition	2017-08-08 22:27:47 +03:00
Alexander Zobnin	e0bbb74b0c	code-editor: test editors for MySQL and prometheus	2017-08-08 18:42:26 +03:00
Alexander Zobnin	0e0e60317e	code-editor: tabSize option	2017-08-08 18:41:11 +03:00
Alexander Zobnin	152c4170da	code-editor: onChange option and usage docs	2017-08-08 18:31:13 +03:00
Torkel Ödegaard	1652426dfe	:Merge branch 'master' of github.com:grafana/grafana	2017-08-08 17:08:49 +02:00
Torkel Ödegaard	68c4ce34d5	fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510	2017-08-08 17:08:35 +02:00