Torkel Ödegaard 9f29c54170 Merge branch 'query_part_refactor' into alerting ...

Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go

2016-08-15 17:54:42 +02:00

..

alert_mig.go

feat(query_part): refactoring query part

2016-08-15 17:20:45 +02:00

annotation_mig.go

feat(query_part): refactoring query part

2016-08-15 17:20:45 +02: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

feat(apps): progress on app dashboard imports

2016-07-08 09:35:06 +02: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

heartbeat_mig.go

feat(query_part): refactoring query part

2016-08-15 17:20:45 +02:00

migrations_test.go

Merge branch 'master' into alert_ui_take2

2016-06-11 12:17:14 +02:00

migrations.go

feat(annotations): working on alert annotations, #5694

2016-08-01 10:07:00 +02:00

org_mig.go

updated circle with fmt formating test

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

playlist_mig.go

refactor(playlist): refactor of playlist feature, and PR #3776

2016-01-18 16:01:14 +01:00

plugin_setting.go

feat(apps): auto update dashboard dashboards, #5529

2016-07-07 18:11:03 +02:00

preferences_mig.go

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

quota_mig.go

enhance quota support.

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

session_mig.go

Issue 3461: Session table is now created automatically

2015-12-23 01:33:46 -06: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