Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ...

Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts

2015-12-14 17:28:57 +01:00

..

apikey_mig.go

Increase api_key.key varchar to 255 length

2015-03-18 13:20:15 -04:00

common.go

Added missing common.go

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

dashboard_mig.go

MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863

2015-04-23 16:18:46 +02:00

dashboard_snapshot_mig.go

Corrected SQL migration for snapshot table column type change, #1880

2015-04-25 20:28:50 +02: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

add pluginBundle backend api methods and SQL storage

2015-12-03 23:43:55 +08:00

org_mig.go

updated circle with fmt formating test

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

plugin_bundle.go

add pluginBundle backend api methods and SQL storage

2015-12-03 23:43:55 +08: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