14 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	e081a5c5a0	feat(apps): worked on pinning apps	2016-01-11 18:03:08 +01:00
Torkel Ödegaard	60e7c6d150	Merge branch 'master' into apps ... Conflicts: public/app/partials/sidemenu.html	2016-01-08 18:10:53 +01:00
Torkel Ödegaard	6c1fee736b	feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687	2016-01-08 17:58:46 +01:00
Torkel Ödegaard	f67563e9ee	feat(apps): moving things around	2016-01-08 12:45:12 +01:00
woodsaj	0903d5541b	Merge branch 'master' of github.com:grafana/grafana into externalPlugin ... Conflicts: pkg/api/api.go pkg/api/api_plugin.go pkg/api/datasources.go pkg/api/frontendsettings.go pkg/api/index.go pkg/plugins/models.go pkg/plugins/plugins.go	2015-12-22 00:23:24 +08:00
woodsaj	48cf56b69a	more renaming. also moved apps and datasource menus	2015-12-18 13:46:40 +08:00
Torkel Ödegaard	ca84ef38f8	angular2 test	2015-12-16 12:21:13 +01:00
Torkel Ödegaard	2ec5bc77d7	Merge branch 'external-plugins'	2015-12-15 10:10:48 +01:00
carl bergquist	1cfa523f49	style(sidemenu): rename signup method to signout	2015-12-14 17:19:26 +01:00
shoonoise	5cf3425b93	Disable sign out button in case of auth proxy enabled	2015-11-26 17:56:45 +03:00
Torkel Ödegaard	df0bc7bbc4	feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
Torkel Ödegaard	69daede583	feat(external plugins): worked on supporting external plugins better	2015-11-19 18:44:07 +01:00
Torkel Ödegaard	b21fa2daa0	Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins	2015-11-19 11:05:27 +01:00
Torkel Ödegaard	d8f68eb118	refactoring: moving and renaming things	2015-10-30 16:06:29 +01:00