1011 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	47bba71d7f	fixed update check	2016-04-12 10:28:32 -04:00
Torkel Ödegaard	e7626befc5	updated version	2016-04-12 10:17:39 -04:00
Torkel Ödegaard	51aed2dbc6	Merge branch 'master' of github.com:grafana/grafana	2016-04-11 21:11:08 -04:00
Torkel Ödegaard	497e9343aa	Merge branch 'pluginlist'	2016-04-11 21:10:54 -04:00
Torkel Ödegaard	6ce934f1dd	feat(pluginlist): worked on plugin list	2016-04-11 20:33:58 -04:00
Torkel Ödegaard	f1ff044967	Merge branch 'master' of github.com:grafana/grafana	2016-04-11 18:16:57 -04:00
Torkel Ödegaard	9c14b9672f	fix(): admin stats and postgres	2016-04-11 18:16:35 -04:00
Torkel Ödegaard	f93b039e42	change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases	2016-04-11 18:05:28 -04:00
Torkel Ödegaard	3849b59627	feat(updates): changed to new api	2016-04-11 17:16:52 -04:00
bergquist	a5eda6a87b	feat(cli): detects plugin folder for dev env ... closes #4572	2016-04-11 22:32:46 +02:00
Torkel Ödegaard	c518fdc155	Merge branch 'updatecheck' into pluginlist	2016-04-11 13:43:29 -04:00
Torkel Ödegaard	ab34b174f9	Added update notice to plugin list	2016-04-11 13:42:52 -04:00
Torkel Ödegaard	6ac3bd4c7c	feat(): update checks starting to work	2016-04-11 12:47:04 -04:00
Torkel Ödegaard	b4a8c227cc	feat(update checks): started work on update checks	2016-04-11 12:21:48 -04:00
bergquist	eeb7524c0f	feat(cli): improve helptext for cli	2016-04-11 14:50:34 +02:00
bergquist	2fd25f0093	feat(cli): add uninstall alias for remove	2016-04-11 14:49:12 +02:00
Torkel Ödegaard	8047f902a5	stats(): updated stats	2016-04-10 18:36:54 -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
bergquist	583c0f09a8	feat(cli): adds better support for plugin folder in dev	2016-04-08 11:59:45 +02:00
Torkel Ödegaard	9b30634217	fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558	2016-04-05 11:24:21 -04:00
bergquist	676e950fa3	fix(cli): improve error message for not using sudo ... closes #4562	2016-04-05 15:37:09 +02:00
Torkel Ödegaard	43ebc172cb	fix(profile): fixed change password link and page, fixes #4542	2016-04-04 13:52:41 -04:00
Torkel Ödegaard	cab859a0e4	Merge branch 'master' into preferences	2016-04-03 05:33:11 -07:00
Torkel Ödegaard	a2c6469d41	fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536	2016-04-03 05:32:15 -07: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
Anthony Woods	036f407d6a	gofmt	2016-03-29 16:04:24 +08:00
Anthony Woods	2c60dbd4fb	handle errors when requesting plugin list. fixes #4494	2016-03-29 15:35:08 +08:00
Torkel Ödegaard	1e44ee9e9b	feat(grafana-cli): minor changes	2016-03-28 21:42:26 +02:00
Torkel Ödegaard	b3bda2aa64	Merge branch 'master' of github.com:grafana/grafana	2016-03-28 20:44:54 +02:00
Anthony Woods	776af45c09	update default repo url in grafana-cli	2016-03-28 23:36:27 +08:00
Torkel Ödegaard	14326b626e	ux(): checkbox now works in dark and white theme	2016-03-28 13:10:42 +02:00
Torkel Ödegaard	f27ce7e1e4	Merge pull request #4461 from dfwarden/ldap_nested_groups ... LDAP Nested Groups	2016-03-28 11:19:28 +02:00
Torkel Ödegaard	b7d198793f	refactor(): minor refactoring of #4455	2016-03-23 15:09:48 +01:00
David Warden	87aca5bf1b	new config option for source of %s in group_search_filter, useful for nested LDAP groups	2016-03-23 08:21:25 -04:00
Torkel Ödegaard	c711fb67c8	Merge branch 'master' into websocket	2016-03-22 10:31:57 +01:00
Torkel Ödegaard	10df9dc8c3	feat(plugins): finished app navigation enhancements, closes #4434	2016-03-22 10:15:47 +01:00
Torkel Ödegaard	65c0937741	ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434	2016-03-21 19:07:08 +01:00
bergquist	14df3c6249	feat(cli): use built in envvar support	2016-03-21 10:11:08 +01:00
bergquist	7f8643efde	feat(cli): make all plugin commands subcommands	2016-03-21 10:01:07 +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	7023dedc05	feat(preferences): refactoring PR #4399	2016-03-20 11:52:19 +01:00
Torkel Ödegaard	9e98c86ae1	Merge branch 'master' into preferences	2016-03-20 11:27:49 +01:00
Torkel Ödegaard	e63ff1c762	feat(dataproxy): set flush interval, need a setting for this	2016-03-19 11:09:26 +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
Torkel Ödegaard	9ddf22ea93	Merge branch 'master' into websocket	2016-03-17 10:16:05 +01:00