1155 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	beb9f8ee74	Merge remote-tracking branch 'origin/master' into develop	2017-12-07 14:14:50 +01:00
Torkel Ödegaard	90bcec8178	nav: updated nav item id for manage dashboards	2017-12-05 12:25:59 +01:00
Torkel Ödegaard	90da964a14	refactoring PR #10068	2017-12-05 12:19:01 +01:00
Alexander Zobnin	4d7ff4de15	move import menu item to the original place	2017-12-04 18:00:22 +03:00
Alexander Zobnin	44ea0ff71d	Move import dashboard from modal to the page	2017-12-04 15:55:37 +03:00
bergquist	d6d64c53cd	typo 💥	2017-12-01 16:23:55 +01:00
Torkel Ödegaard	68580f06a3	page header now on 99% of pages	2017-12-01 13:49:15 +01:00
Torkel Ödegaard	6bff416430	navigation: more progress on new page header	2017-12-01 12:51:46 +01:00
Torkel Ödegaard	75bb894485	ux: new page-header design, most pages beside admin done	2017-12-01 11:32:00 +01:00
Torkel Ödegaard	e53b55479a	ux: made plugins page work	2017-12-01 10:47:21 +01:00
Torkel Ödegaard	6f5a9bf768	ux: new page header progress	2017-11-30 17:28:24 +01:00
Torkel Ödegaard	b2add1977a	ux: progress on new page header	2017-11-30 16:35:27 +01:00
Torkel Ödegaard	74ceb76ec0	ux: work on page header	2017-11-30 15:37:03 +01:00
Torkel Ödegaard	645f49eda4	ux: updating header design for pages	2017-11-30 11:31:38 +01:00
jomenxiao	3f95180c98	fix render http[get] params error	2017-11-28 22:20:22 +08:00
Torkel Ödegaard	9fc22e5a66	Merge branch 'master' of github.com:grafana/grafana into develop	2017-11-21 16:05:18 +01:00
bergquist	3a772c7f7f	allows head requests for /api/health endpoint ... closes #9955	2017-11-21 15:03:04 +01:00
Torkel Ödegaard	0d12b37dfd	fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951	2017-11-21 11:28:17 +01:00
Torkel Ödegaard	fc1d8416a7	working on dashboard search	2017-11-20 12:47:03 +01:00
Torkel Ödegaard	0e44fe082b	Merge branch 'master' into develop	2017-11-17 15:49:17 +01:00
Torkel Ödegaard	303e3de488	fix: fix for avatar images when gzip is turned on, fixes #5952	2017-11-17 13:13:58 +01:00
bergquist	0f69e06fcf	removes invalid comment	2017-11-16 16:55:02 +01:00
Marcus Efraimsson	909601d6ab	api: fix so that datasources functions returns Response	2017-11-16 16:29:05 +01:00
Marcus Efraimsson	89b27b35ba	fix: Use Response as return type	2017-11-16 16:19:01 +01:00
Marcus Efraimsson	540d540ea9	fix: return id from api when creating new annotation/graphite annotation, fixes #9798 ... When creating a region annotation the response will include both id (region start id) and endId (region end id), if not only id.	2017-11-16 16:19:01 +01:00
bergquist	36676e23c1	datasource as cfg: adds readonly datasources	2017-11-15 14:30:32 +01:00
Daniel Lee	0d85c63fff	middleware: recovery handles panics in all handlers ... Also, changes the order of the middleware so that recovery is after the gzip middleware. Otherwise, a 200 OK is returned instead of a 500 error.	2017-11-15 13:57:33 +01:00
Torkel Ödegaard	97cc454ded	ux: minor changes	2017-11-01 14:23:46 +01:00
Torkel Ödegaard	84b10df887	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-10-31 16:14:40 +01:00
Daniel Lee	752453f204	dashboards: fix link to bulk edit	2017-10-29 20:20:51 +01:00
Torkel Ödegaard	cae852a1a2	updated icons	2017-10-27 08:33:04 +02:00
Torkel Ödegaard	9605ab4475	Merge branch 'master' into develop	2017-10-26 15:59:50 +02:00
Daniel Lee	7f3293ce80	dashfolders: rough draft of bulk edit	2017-10-25 16:12:03 +02:00
Carl Bergquist	c91a1e994b	Merge pull request #9594 from bergquist/datasources_optimistic_concurrency ... datasources: change to optimistic concurrency	2017-10-25 12:44:36 +02:00
bergquist	d68bfaa8be	datasource as cfg: typo	2017-10-25 12:21:06 +02:00
Torkel Ödegaard	a299118c92	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-10-24 20:29:53 +02:00
Daniel Lee	f70fb7dbf3	dashboard: fix home dashboard getting started panel	2017-10-24 19:22:56 +02:00
bergquist	9b6535cca1	alerting: only editors can pause rules ... closes #9640	2017-10-24 11:01:08 +02:00
Torkel Ödegaard	b44daaabf2	Merge branch 'master' into develop	2017-10-24 09:06:09 +02:00
Torkel Ödegaard	9cce5217d0	build: fixed gofmt issue and addd mock response feature	2017-10-23 09:57:28 +02:00
bergquist	139f077453	prometheus: enable gzip for /metrics endpoint ... closes #9464	2017-10-23 09:35:46 +02:00
Torkel Ödegaard	1fd2270a93	build: split circle test shell scripts	2017-10-23 09:06:50 +02:00
bergquist	89923bf77a	datasources: change to optimisic concurrency ... prerequisite for #9504	2017-10-23 07:55:16 +02:00
Torkel Ödegaard	fff0fa2aee	Merge branch 'master' into develop	2017-10-22 11:51:14 +02:00
Alexander Zobnin	74e90d01ec	Fixes for annotations API (#9577) ... * annotations: throw error if no text specified and set default time to Now() if empty, #9571 * annotations: fix saving graphite event with empty string tags * docs: add /api/annotations/graphite endpoint docs, #9571	2017-10-18 10:13:02 +02:00
Torkel Ödegaard	6f71af449b	ux: new fixes	2017-10-18 09:48:37 +02:00
Daniel Lee	5f6ab1e370	styleguide: fix link in index	2017-10-16 14:11:52 +02:00
Daniel Lee	b866383ec0	api: fix for dashboard version history	2017-10-16 14:09:52 +02:00
Torkel Ödegaard	a3bd761b0c	ux: testing out new icons	2017-10-14 21:17:16 +02:00
Torkel Ödegaard	48c8e4d627	fix: various fixes for new grid	2017-10-12 17:38:49 +02:00