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

..

address.go

feat(organization): added update org address to http api and to org details settings view, closes #2672

2015-09-08 14:22:44 +02:00

apikey.go

HTTP API: grafana /render calls nows with api keys, Fixes #1649

2015-04-08 08:59:12 +02:00

app_plugin.go

allow app menu items to be selectivly pinned to the left nav menu

2015-12-18 15:10:52 +08:00

dashboard_snapshot.go

Dashboard snapshot: more work on snapshot deletion, and saving external reference, #1623

2015-03-26 20:59:41 +01:00

dashboards_test.go

Fix for validating tags in dashboard json in backend, Fixes #2152

2015-06-12 09:04:10 +02:00

dashboards.go

Removed created_by and fixed gofmt

2015-12-18 02:30:20 -08:00

datasource.go

add with_credentials to datasource model

2015-12-09 14:44:28 +09:00

emails.go

Simplified emailing system and combined mailer and notifications packages

2015-06-08 16:51:25 +02:00

home_dashboard.go

Worked on home dashboard

2015-02-03 15:04:35 +01:00

models.go

clearer errors

2015-07-08 08:55:31 +02:00

org_user.go

feat(invite): handling of existing org user case when inviting, #2353

2015-07-21 12:18:11 +02:00

org.go

feat(organization): added update org address to http api and to org details settings view, closes #2672

2015-09-08 14:22:44 +02:00

quotas.go

move toMap function to be a method on the quota structs

2015-09-15 17:18:26 +08:00

search.go

Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960

2015-05-13 13:36:24 +02:00

star.go

Added isStarred to search result hit, very inefficient loading right now but can be cached later on

2015-02-05 09:49:00 +01:00

stats.go

feat(usage stats): added data source count stats

2015-09-29 13:47:56 +02:00

temp_user.go

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

user.go

fixed gofmt tests

2015-11-16 07:28:38 -08:00