Torkel Ödegaard 49a0ea53c7 Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc ...

Conflicts:
	src/app/features/dashboard/partials/shareDashboard.html

2015-03-22 22:04:13 -04:00

..

migrations

Adding snapshot storage and route, #1623

2015-03-21 10:56:26 -04:00

migrator

All migrations work in sqlite3, mysql and postgres

2015-02-25 07:57:51 +01:00

sqlutil

a lot of work on database schema and migration setup, postgres now works, every integration test passes for all database types, only token table left to do

2015-01-20 14:15:48 +01:00

apikey_test.go

New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440

2015-02-26 17:23:28 +01:00

apikey.go

New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440

2015-02-26 17:23:28 +01:00

dashboard_snapshot_test.go

more work on dashboard snapshots

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

dashboard_snapshot.go

more work on dashboard snapshots

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

dashboard_test.go

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

dashboard.go

Added server metrics

2015-03-22 15:14:00 -04:00

datasource_test.go

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

datasource.go

Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510

2015-03-02 09:58:35 +01:00

org_test.go

Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585

2015-03-11 16:19:29 +01:00

org_users.go

account -> org table migration is starting to work, need to test mysql and postgres

2015-02-24 18:32:29 +01:00

org.go

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

shared.go

Changed go package path

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

sqlstore.go

Progress on database schema migration for account -> org refactor

2015-02-24 11:46:34 +01: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

Added server metrics

2015-03-22 15:14:00 -04:00

tables.go

Began work on real sql schema definitions, and migration engine

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

user.go

gofmt. remove extra whitespace

2015-03-17 23:42:16 +08:00