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

..

apikey_mig.go

Increase api_key.key varchar to 255 length

2015-03-18 13:20:15 -04: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

common.go

Added missing common.go

2015-02-24 19:10:41 +01:00

dashboard_mig.go

Successfully displayed userdId in UI

2015-12-18 01:52:05 -08:00

dashboard_snapshot_mig.go

Successfully displayed userdId in UI

2015-12-18 01:52:05 -08:00

datasource_mig.go

add with_credentials to datasource model

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

migrations_test.go

Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921

2015-05-01 16:23:36 +02:00

migrations.go

refactor.

2015-12-17 23:53:58 +08:00

org_mig.go

updated circle with fmt formating test

2015-03-07 16:23:22 +01:00

quota_mig.go

enhance quota support.

2015-09-11 23:17:10 +08:00

temp_user.go

fix(mysql): fix for migration in newly added temp_user table, fixes #2509

2015-08-14 09:41:07 +02:00

user_mig.go

Fixed gofmt formating, updated precommit hook

2015-03-07 16:37:19 +01:00