19555 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	e218cc7637	docs: updates docs to refer to using uid	2019-01-28 22:03:16 +01:00
bergquist	7c93335d28	gofmt issue	2019-01-28 21:04:08 +01:00
bergquist	809019d4ee	moves test files into testdata folder	2019-01-28 20:44:10 +01:00
bergquist	8f0e65a150	renames alert_notifications -> notifiers	2019-01-28 20:39:09 +01:00
bergquist	21fff415ed	removes unnessecary db request	2019-01-28 15:37:52 +01:00
bergquist	935da14f7d	tab/spaces formatting	2019-01-28 15:27:02 +01:00
bergquist	6a8643b3d1	Merge branch 'master' into configurable-alert-notification ... * master: (250 commits) Firing off an action instead of listening to location changes Changes after PR Comments Made ExplorerToolbar connected and refactored away responsabilities from Explore Removed some split complexity Fixed some more styling Fixed close split look and feel Fixed position of Closesplit Fixed small issue with TimePicker dropdown position Simplified some styles and dom elements Fixed some more with the sidemenu open and smaller screens Fixed so heading looks good with closed sidemenu Restructure of component and styling Refactored out ExploreToolbar from Explore Fixed reinitialise of Explore changelog: add notes about closing #13929 changelog: add notes about closing #14558 changelog: add notes about closing #14484 changelog: add notes about closing #13765 changelog: add notes about closing #11503 changelog: add notes about closing #4075 ...	2019-01-28 14:16:43 +01:00
bergquist	48aa173f67	support both uid and id for showing/removing notifiers	2019-01-28 14:00:55 +01:00
David	edfce0893e	Merge pull request #15090 from grafana/hugoh/bug-explore-cant-go-from-dashboard-to-explore ... Fixed reinitialise of Explore	2019-01-28 13:43:32 +01:00
Hugo Häggmark	6b0400eed2	Firing off an action instead of listening to location changes	2019-01-28 13:27:56 +01:00
Hugo Häggmark	9298876ef0	Changes after PR Comments	2019-01-28 12:47:01 +01:00
Hugo Häggmark	1e6d50df7a	Made ExplorerToolbar connected and refactored away responsabilities from Explore	2019-01-28 12:47:01 +01:00
Hugo Häggmark	21df0c90a9	Removed some split complexity	2019-01-28 12:47:01 +01:00
Hugo Häggmark	0a094a13f2	Fixed some more styling	2019-01-28 12:47:01 +01:00
Hugo Häggmark	18727dce23	Fixed close split look and feel	2019-01-28 12:47:01 +01:00
Hugo Häggmark	42f700054f	Fixed position of Closesplit	2019-01-28 12:47:01 +01:00
Hugo Häggmark	d2a5477654	Fixed small issue with TimePicker dropdown position	2019-01-28 12:47:01 +01:00
Hugo Häggmark	032a82feed	Simplified some styles and dom elements	2019-01-28 12:47:01 +01:00
Hugo Häggmark	9caaf25078	Fixed some more with the sidemenu open and smaller screens	2019-01-28 12:47:01 +01:00
Hugo Häggmark	b2c284e42c	Fixed so heading looks good with closed sidemenu	2019-01-28 12:47:01 +01:00
Hugo Häggmark	ffe03ee22d	Restructure of component and styling	2019-01-28 12:47:01 +01:00
Hugo Häggmark	1aefc4cc2d	Refactored out ExploreToolbar from Explore	2019-01-28 12:47:01 +01:00
Hugo Häggmark	40f410562a	Fixed reinitialise of Explore	2019-01-28 11:45:15 +01:00
Marcus Efraimsson	c7e50a79d7	changelog: add notes about closing #13929	2019-01-28 11:29:50 +01:00
Marcus Efraimsson	5807fc1383	changelog: add notes about closing #14558	2019-01-28 11:20:23 +01:00
Marcus Efraimsson	c52dde4c1b	changelog: add notes about closing #14484	2019-01-28 11:18:37 +01:00
Marcus Efraimsson	4678f43aeb	changelog: add notes about closing #13765	2019-01-28 11:15:00 +01:00
Marcus Efraimsson	2a0689a1f5	changelog: add notes about closing #11503	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	a9fd076470	changelog: add notes about closing #4075	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	5869eba467	changelog: add notes about closing #14722	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	ec41c4a572	update changelog	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	ac17da624d	changelog: add notes about closing #10322	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	9eddb59705	changelog: add notes about closing #12991	2019-01-28 11:08:16 +01:00
Marcus Efraimsson	1d1d085b96	update changelog	2019-01-28 11:08:16 +01:00
Torkel Ödegaard	642e1115f7	Merge pull request #15076 from grafana/minor-moving-task ... Moving a few things from dashboard folder	2019-01-28 10:57:04 +01:00
Carl Bergquist	5082b66e3d	Merge pull request #15078 from grafana/golang_1.11.5 ... upgrade golang to 1.11.5	2019-01-28 10:20:20 +01:00
Torkel Ödegaard	de79c27bcb	Fixed import path	2019-01-28 09:20:54 +01:00
bergquist	019848484b	changelog: adds note about closing #14701	2019-01-28 08:35:14 +01:00
Carl Bergquist	711f9bc034	Merge pull request #14883 from sharkpc0813/14701-fix-alert-context ... fix that alert context and result handle context do not use the same derived context.	2019-01-28 08:30:45 +01:00
bergquist	0cbc89b063	Merge branch 'master' into 14701-fix-alert-context ... * master: (262 commits) pkg/services/dashboards/dashboard_service.go: simplify return Updated url query param encoding to exctly match angular encoding Updated snapshot Added missing props not being passed to scrollbar component, fixes #15058 Document /api/health changelog: adds note for #15062 change default rotate_token_minutes to 10 minutes fix load test/ha fixes set low login cookie rotate time in ha mode fix multiple piechart instances bug scripts/build/*: Fix some golint issues scripts/build/*: Fix golint issues Url => URL build: fixes building grafana completely within docker. dont specify domain for auth cookies New snapshot reflecting changes Makes the clickable side menu header look great in light theme again org id fix for load test user auth token load tests using k6.io moves cookie https setting to [security] ...	2019-01-28 08:09:52 +01:00
bergquist	d75f53e895	upgrade golang to 1.11.5	2019-01-28 08:08:29 +01:00
bergquist	364154d81f	moves timeout tests to an integration test	2019-01-28 07:56:31 +01:00
Carl Bergquist	87d44490e6	Merge pull request #15072 from mjtrangoni/fix-megacheck-issue ... pkg/services/dashboards/dashboard_service.go: simplify return	2019-01-27 23:41:37 +01:00
Torkel Ödegaard	7f2c2a913e	Moving a few things from dashboard folder	2019-01-27 17:33:13 +01:00
Mario Trangoni	bf90ff87cf	pkg/services/dashboards/dashboard_service.go: simplify return ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./... pkg/services/dashboards/dashboard_service.go:167:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)	2019-01-26 14:23:10 +01:00
Torkel Ödegaard	84d1ce8fe3	Merge pull request #15071 from grafana/explore-url-fixes ... Updated url query param encoding to exctly match angular encoding	2019-01-26 12:41:32 +01:00
Torkel Ödegaard	0975f816aa	Updated url query param encoding to exctly match angular encoding	2019-01-26 12:05:37 +01:00
Torkel Ödegaard	7956c74406	Merge pull request #15070 from grafana/scrollbar-fixes ... Added missing props not being passed to scrollbar component	2019-01-26 11:48:48 +01:00
Torkel Ödegaard	f3dc5381ee	Merge pull request #15018 from miroswan/14961-constructor-as-rvalue ... Bug Fix #14961	2019-01-26 11:11:32 +01:00
Torkel Ödegaard	27858c0272	Updated snapshot	2019-01-26 11:04:50 +01:00