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

..

apikey.go

Merge branch 'develop' into apikey_hashed

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

dashboard_test.go

dashboard load/save work and began work on register

2014-08-22 15:32:42 +02:00

dashboards.go

Big Backend Refatoring: Renamed Account -> Org

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

datasource.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

home_dashboard.go

Worked on home dashboard

2015-02-03 15:04:35 +01:00

models.go

working on oauth

2014-10-07 15:54:38 -04:00

org_user.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

search.go

Big Backend Refatoring: Renamed Account -> Org

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

star.go

Added isStarred to search result hit, very inefficient loading right now but can be cached later on

2015-02-05 09:49:00 +01:00

user.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