6961 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	ef92fd4ebc	feat(alerting): renames error_level to crit_level	2016-04-20 15:02:49 +02:00
bergquist	7860a2a1b8	feat(alerting): make sure dashboard id exists	2016-04-20 09:55:32 +02:00
bergquist	ca3ad7d17c	tests(alerting): add tests for saving alerts	2016-04-19 16:52:20 +02:00
bergquist	832e38af34	feat(alerting): limit alerts to one per panel	2016-04-19 15:34:23 +02:00
bergquist	daa5468801	feat(alerting): parses dashboard alerts	2016-04-18 14:15:03 +02:00
bergquist	769016783f	feat(alerting): add aggregator field	2016-04-18 11:10:52 +02:00
bergquist	bcf10a6483	Merge branch 'master' into alerting_definitions	2016-04-18 10:28:40 +02:00
Torkel Ödegaard	822bf13b7a	Merge pull request #4728 from grafana/code-style-improvements ... Code style improvements	2016-04-16 12:09:40 -04:00
Torkel Ödegaard	6b2fedb1c2	Merge branch 'master' of github.com:grafana/grafana	2016-04-15 19:57:12 -04:00
Torkel Ödegaard	e307ada374	ux(): tooltip improvement	2016-04-15 19:56:39 -04:00
Torkel Ödegaard	4f2628c221	fix(): fixed issue with templating preview, fixes #4714	2016-04-15 18:50:48 -04:00
Torkel Ödegaard	0f16066915	fix(): zoom out tooltip fix, fixes #4729	2016-04-15 18:32:03 -04:00
Matt Toback	151d8db98d	removed unnecessary style	2016-04-15 15:00:29 -04:00
Matt Toback	614b26fff6	Fixed inline code styles and increase line heights in lists to accommodate code	2016-04-15 14:58:20 -04:00
Torkel Ödegaard	49b2743a37	Merge branch 'master' of github.com:grafana/grafana	2016-04-15 14:36:51 -04:00
Torkel Ödegaard	8e37de19c9	ux(): minor fix to tooltip in template editor view	2016-04-15 14:36:43 -04:00
Matt Toback	38bda92bdc	Update dashnav.html	2016-04-15 13:26:27 -04:00
Torkel Ödegaard	83ba6638a1	bumped version	2016-04-15 10:50:21 -04:00
Torkel Ödegaard	4832ecf3e7	docs(): updated download links	2016-04-15 09:25:09 -04:00
Torkel Ödegaard	2e8ed97355	changelog(grafana-cli): fixed issue with grafana-cli and plugins dir, fixes #4723	2016-04-15 09:13:06 -04:00
Torkel Ödegaard	d98839fc19	Revert "feat(cli): detects plugin folder for dev env" ... This reverts commit a5eda6a87b.	2016-04-15 09:01:27 -04:00
Torkel Ödegaard	75555c470b	Update latest.json	2016-04-14 18:09:04 -04:00
Torkel Ödegaard	b3f3b70b90	Merge branch 'master' of github.com:grafana/grafana	2016-04-14 14:15:59 -04:00
Torkel Ödegaard	924800b7df	bumped version	2016-04-14 14:15:47 -04:00
Matt Toback	d27da57b02	Fixed the fix.	2016-04-14 12:39:37 -04:00
Torkel Ödegaard	f1a01aed7e	Merge pull request #4711 from grafana/issue-4704 ... Updated colors to fix issue	2016-04-14 12:30:47 -04:00
Matt Toback	c1a5771fcd	Updated colors to fix issue	2016-04-14 11:38:07 -04:00
Matt Toback	8ac5c36735	Still not fixed, not sure why. ... despite having pushed that code with @torkelo.	2016-04-14 11:12:00 -04:00
Torkel Ödegaard	6355896584	fix(snapshots): Fixed issue with empty snapshots, fixes #4706	2016-04-14 11:06:48 -04:00
Torkel Ödegaard	6216ce455f	fix(pluginlist): fixed issue with pluginlist link, fixes #4705	2016-04-14 10:55:24 -04:00
Torkel Ödegaard	c0832995ae	Merge branch 'master' of github.com:grafana/grafana	2016-04-14 08:47:38 -04:00
Torkel Ödegaard	9469b20cbd	fix(graph): Fixed issue with light theme text color issue in tooltip, fixes #4702	2016-04-14 08:41:54 -04:00
Torkel Ödegaard	573457c03f	fix(build): fixed build script issue	2016-04-13 17:48:20 -04:00
Torkel Ödegaard	5c395424c6	updated changelog	2016-04-13 17:42:33 -04:00
Torkel Ödegaard	f6d53df282	Merge branch 'master' of github.com:grafana/grafana	2016-04-13 17:33:17 -04:00
Torkel Ödegaard	e4374b1d56	docs(): updated download links	2016-04-13 17:33:03 -04:00
Torkel Ödegaard	7302ddaba5	docs(): fixed docs fixes #46688	2016-04-13 16:43:00 -04:00
Torkel Ödegaard	7456514816	fix(templating): fixed issue with template variables that use regex extraction, fixes #4672	2016-04-13 16:41:19 -04:00
Torkel Ödegaard	d9ad4cf2fc	fix(): made plugin settings api call accessable for viewer roles	2016-04-13 13:03:41 -04:00
Torkel Ödegaard	8b4efbed06	Merge branch 'master' of github.com:grafana/grafana	2016-04-13 12:23:45 -04:00
Torkel Ödegaard	10131aa8a0	fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686	2016-04-13 12:23:29 -04:00
Torkel Ödegaard	23dc85c1de	Merge pull request #4628 from timstanley1985/master ... Fix build on RPi. Building from source timesout on karma tests so increase timeouts	2016-04-13 10:32:46 -04:00
Torkel Ödegaard	338c6b5a5c	Merge pull request #4671 from grafana/login-page-style ... Updated background color on div	2016-04-13 10:28:40 -04:00
bergquist	91a1a823e2	feat(alerting): add basic tables for alerting definitions	2016-04-13 10:33:45 +02:00
Matt Toback	c13ebce2f6	Update module.html	2016-04-12 17:01:30 -04:00
Matt Toback	b6ccd7ffbe	Updated background color on div	2016-04-12 15:18:47 -04:00
Torkel Ödegaard	ad0794cc59	ux(): updated light theme	2016-04-12 14:26:55 -04:00
Torkel Ödegaard	6961cb7440	ux(): reduced tooltip border radius	2016-04-12 13:29:31 -04:00
Torkel Ödegaard	9868edb138	ux(): changed tooltip style	2016-04-12 13:00:33 -04:00
Torkel Ödegaard	e822fad505	fix(timepicker): fixed issues and added some polish to timepicker shift back/forward buttons	2016-04-12 12:41:17 -04:00