Torkel Ödegaard 6a2a6afc1d Merge branch 'develop' into apikey_hashed ...

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

2015-02-26 15:48:54 +01:00

..

dtos

Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517

2015-02-26 15:43:48 +01:00

admin_settings.go

Worked on playlist update for Grafana 2.0, added dashboard search to playliststart view, #1460

2015-02-13 08:47:44 +01:00

admin_users.go

Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517

2015-02-26 15:43:48 +01:00

api.go

Merge branch 'develop' into apikey_hashed

2015-02-26 15:48:54 +01:00

apikey.go

Merge branch 'develop' into apikey_hashed

2015-02-26 15:48:54 +01:00

dashboard.go

Big Backend Refatoring: Renamed Account -> Org

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

dataproxy_test.go

Fixed sql integration test

2015-02-23 20:48:43 +01:00

dataproxy.go

Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525

2015-02-25 18:43:44 +01:00

datasources.go

Big Backend Refatoring: Renamed Account -> Org

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

frontendsettings.go

Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525

2015-02-25 18:43:44 +01:00

index.go

Big Backend Refatoring: Renamed Account -> Org

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

login_oauth.go

Changed go package path

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

login.go

Changed go package path

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

metrics.go

Changed go package path

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

org_users.go

Big Backend Refatoring: Renamed Account -> Org

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

org.go

Big Backend Refatoring: Renamed Account -> Org

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

render.go

Fixed bug in png rendering when having changed public url

2015-02-06 14:17:40 +01:00

search.go

Big Backend Refatoring: Renamed Account -> Org

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

signup.go

Changed go package path

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

stars.go

Changed go package path

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

user.go

Big Backend Refatoring: Renamed Account -> Org

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