Torkel Ödegaard 69d0e82453 Merge branch 'master' into apps ...

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

2016-01-08 10:20:46 +01:00

..

migrations

Merge branch 'master' into apps

2016-01-08 10:20:46 +01:00

migrator

Removed NewAddColumnMigration via 3473

2015-12-16 02:46:20 -08:00

sqlutil

Added expire option to dashboard snapshots, #1623

2015-03-26 12:00:52 +01:00

apikey_test.go

Added expire option to dashboard snapshots, #1623

2015-03-26 12:00:52 +01: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

feat(plugins): WIP on new apps concept

2015-12-21 23:09:27 +01:00

dashboard_snapshot_test.go

more work on dashboard snapshots

2015-03-21 08:53:16 -04:00

dashboard_snapshot.go

clearer errors

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

dashboard_test.go

More work on email and notification infra #1456

2015-06-05 11:08:19 +02:00

dashboard.go

fix(db): remove stars and tags when removing user or dashboard, fixes #2016

2015-08-12 09:23:46 +02:00

datasource_test.go

Restored sql integration tests to use in mem sqlite3

2015-04-23 16:21:49 +02:00

datasource.go

add with_credentials to datasource model

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

org_test.go

Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014

2015-05-19 11:47:14 +02:00

org_users.go

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

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

org.go

fix(logging): removed temp dev logging code

2015-09-08 14:32:25 +02:00

quota_test.go

add unittests for quota sqltore methods.

2015-09-15 17:10:46 +08:00

quota.go

move toMap function to be a method on the quota structs

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

shared.go

Changed go package path

2015-02-05 10:37:13 +01:00

sqlstore.go

Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql

2016-01-07 17:08:31 +01:00

sqlstore.goconvey

feat(invite): small progress

2015-07-17 14:42:49 +02:00

star.go

Changed go package path

2015-02-05 10:37:13 +01:00

stars_test.go

Fixed gofmt formating, updated precommit hook

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

stats.go

feat(usage stats): added data source count stats

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

tables.go

Began work on real sql schema definitions, and migration engine

2015-01-17 21:40:22 +01:00

temp_user_test.go

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

2015-08-28 15:14:24 +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

tls_mysql.go

gofmt

2015-12-22 13:10:34 +00:00

user.go

Used dialect for postgres

2015-11-07 05:21:22 -08:00