Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting ...

Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go

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

..

alerting.go

feat(alerting): only expose DTO info when requesting all notifications

2016-06-20 11:31:20 +02: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

index.go

feat(footer): began work on page footer

2016-05-03 09:00:58 +02:00

invite.go

feat(invite): can now add org user with sername again, #2353

2015-08-10 14:03:08 +02:00

models.go

refactor(): refactored date handling and locale handling in #5517

2016-07-05 17:59:43 +02:00

org.go

feat(organization): added update org address to http api and to org details settings view, closes #2672

2015-09-08 14:22:44 +02:00

plugins.go

feat(import): more import work

2016-05-14 10:00:43 +02:00

prefs.go

feat(preferences): theme and home dashbord settings now work work on profile and org settings page

2016-04-02 13:54:06 -07:00

stream.go

feat(grafana_live): more work pushing data to websocket, #4355

2016-03-14 22:26:43 +01:00

user.go

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

2015-08-28 15:14:24 +02:00