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

..

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

alert_notifications.go

feat(alerting): add default notification group

2016-06-20 15:24:48 +02:00

alert_state.go

feat(alerting): add triggeredAlerts as json to alert_state

2016-06-23 11:14:40 +02:00

alert_test.go

tech(alerting): expression -> settings

2016-06-13 15:18:19 +02:00

alert.go

feat(alerting): saves new state when alert updates

2016-06-29 00:05:48 +02:00

apikey.go

HTTP API: grafana /render calls nows with api keys, Fixes #1649

2015-04-08 08:59:12 +02:00

dashboard_snapshot.go

fix(snapshots): sets default value for snapshot name

2016-04-21 09:59:48 +02:00

dashboards_test.go

refactor(): refactoring json usage

2016-03-12 00:13:06 +01:00

dashboards.go

feat(apps): more work on plugin dashboard sync

2016-07-08 13:41:46 +02:00

datasource.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

home_dashboard.go

Worked on home dashboard

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

models.go

clearer errors

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

notifications.go

tech(alerting): enforce POST for webhooks

2016-06-16 08:16:16 +02:00

org_user.go

fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784

2016-04-25 14:00:49 +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

playlist.go

chore(playlist): remove unused code

2016-01-29 20:24:06 +01:00

plugin_settings.go

feat(apps): progress on app dashboard sync

2016-07-08 12:26:51 +02:00

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

quotas.go

move toMap function to be a method on the quota structs

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

search.go

Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960

2015-05-13 13:36:24 +02: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

stats.go

fix(): admin stats and postgres

2016-04-11 18:16:35 -04:00

temp_user.go

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

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

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