208 Commits

Author	SHA1	Message	Date
bergquist	1686d86c3b	Merge branch 'master' into alerting_definitions	2016-05-30 08:26:08 +02:00
Mukesh	4038b4d17e	Set active org through admin api (#5179)	2016-05-26 06:51:23 +02:00
bergquist	8c2b6b532d	fix(preferences): fixes broken default home dashboard ... closes #5167	2016-05-25 09:56:45 +02:00
bergquist	1fe2055743	tech(alerting): disable DEL for alert rules in the api	2016-05-10 15:02:11 +02:00
bergquist	1bb8bc58b8	feat(alerting): add parameteters for filtering alerts	2016-05-10 09:45:56 +02:00
bergquist	47070f2d1f	chore(alerting): struct names and url refactoring	2016-05-09 11:25:21 +02:00
bergquist	27274f37e8	feat(alerting): update paths for alert state	2016-05-06 14:37:41 +02:00
bergquist	743a6fa37c	feat(alerting): add support for deleting alert rules	2016-05-02 16:07:19 +02:00
bergquist	f442adca47	feat(alerting): adds api endpoints for alerts per dashboard and panel	2016-04-28 15:13:42 +02:00
bergquist	ecfbc2edca	feat(alerting): adds alert history page	2016-04-28 11:42:03 +02:00
bergquist	0f0fa0c257	feat(alerting): adds endpoint for getting alert states log	2016-04-28 10:59:46 +02:00
bergquist	e7be7d2835	feat(alerting): add api endpoint for alert state	2016-04-28 08:23:50 +02:00
bergquist	6a5ecb3fca	feat(alerting): adds basic page for listing alerts	2016-04-27 13:02:28 +02:00
bergquist	973db1ac38	feat(alerting): add api route for alert changes	2016-04-27 08:59:33 +02:00
bergquist	9b50313f11	feat(alerting): add api endpoints for listing alerts	2016-04-26 17:36:50 +02:00
Torkel Ödegaard	d9ad4cf2fc	fix(): made plugin settings api call accessable for viewer roles	2016-04-13 13:03:41 -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	12800f831a	Merge branch 'master' into pluginlist	2016-04-09 15:01:39 -04:00
Torkel Ödegaard	370589d6c0	fix(org switch): fixed issue with switching orgs, fixes #4614	2016-04-09 13:27:06 -04:00
Torkel Ödegaard	d70ef90bdd	feat(): plugin list panel	2016-04-08 16:42:33 -04:00
Torkel Ödegaard	43ebc172cb	fix(profile): fixed change password link and page, fixes #4542	2016-04-04 13:52:41 -04:00
Torkel Ödegaard	ab1048b7ee	feat(preferences): theme and home dashbord settings now work work on profile and org settings page	2016-04-02 13:54:06 -07:00
Torkel Ödegaard	38a10f8be4	progress	2016-04-01 17:34:30 -07:00
Torkel Ödegaard	6ed9164c9d	Merge branch 'master' of github.com:grafana/grafana into preferences	2016-03-30 13:35:17 -07:00
Torkel Ödegaard	14326b626e	ux(): checkbox now works in dark and white theme	2016-03-28 13:10:42 +02:00
Torkel Ödegaard	c711fb67c8	Merge branch 'master' into websocket	2016-03-22 10:31:57 +01:00
Torkel Ödegaard	5e431149cd	feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399	2016-03-20 11:54:24 +01:00
Torkel Ödegaard	9e98c86ae1	Merge branch 'master' into preferences	2016-03-20 11:27:49 +01:00
utkarshcmu	9d4fa87914	Viewer not able to delete snapshot	2016-03-18 01:13:34 -07:00
utkarshcmu	cb42cfc6af	Removed unwanted api, moved logic into backend	2016-03-17 02:29:34 -07:00
utkarshcmu	4fbe954a79	Home dashboard per user per org works	2016-03-17 01:38:18 -07:00
utkarshcmu	66621d762e	Added getDashboardSlugById api	2016-03-17 01:01:58 -07:00
utkarshcmu	9dd6aefcec	Minor corrections	2016-03-16 23:35:06 -07:00
utkarshcmu	749fd618a9	Saving home dashboard id in table	2016-03-16 23:22:27 -07:00
Torkel Ödegaard	e06756bcab	Merge branch 'preferences' of github.com:grafana/grafana into preferences	2016-03-15 22:15:27 +01:00
Torkel Ödegaard	9c222a445f	Merge branch 'master' into preferences	2016-03-15 22:14:35 +01:00
Torkel Ödegaard	3d5251d9a5	feat(websocket): more work websocket ds, # 4355	2016-03-14 17:32:48 +01:00
Torkel Ödegaard	195be2742c	feat(live): wip work	2016-03-14 16:18:07 +01:00
Torkel Ödegaard	fbd94fc6ce	feat(websockets): inital work on websockets, #4355	2016-03-14 11:59:51 +01:00
utkarshcmu	e371e03696	Able to save preference version, created, updated fields	2016-03-14 03:12:52 -07:00
Torkel Ödegaard	5b6754ce6c	Merge branch 'master' into websocket	2016-03-14 10:33:11 +01:00
Torkel Ödegaard	581ffb862c	feat(plugins): polish to plugin page, better handling for reading readme file contents	2016-03-13 19:21:44 +01:00
Torkel Ödegaard	c5a817194a	more work on dashboard importing and templating	2016-03-11 17:31:57 +01:00
utkarshcmu	43b474143c	Preferences model updated	2016-03-11 06:30:05 -08:00
Torkel Ödegaard	ece8a925a6	Merge branch 'master' of github.com:grafana/grafana ... Conflicts: examples/nginx-app/package.json examples/nginx-app/plugin.json	2016-03-11 12:39:10 +01:00
Torkel Ödegaard	2de439bd1e	feat(plugins): progress on dashboard installs , #4298	2016-03-11 09:57:20 +01:00
utkarshcmu	4fbff99186	Implemented GetDataSourceIdByName API	2016-03-10 01:31:10 -08:00
utkarshcmu	8afd56575c	Moved api in correct group	2016-03-10 00:48:38 -08:00
Torkel Ödegaard	dfaa6d8eb9	feat(plugins): a lot of work on #4298	2016-03-08 18:17:47 +01:00
utkarshcmu	1a39d93b4e	Implemented GetDataSourceByName API	2016-03-08 01:54:10 -08:00