Torkel Ödegaard 1dab313ca3 Merge branch 'master' into develop

2017-08-14 10:30:36 +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

tech(notifications): splitt into 3 queries

2016-09-06 08:43:15 +02:00

alert_test.go

feat(alerting): add alert message to slack integration

2016-08-12 10:12:04 +02:00

alert.go

alerting: dedupe alert notifications when running multiple servers

2017-02-21 16:54:49 +01:00

apikey.go

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

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

dashboard_acl_test.go

WIP: Permission Type as string in permission query

2017-06-12 15:49:09 +02:00

dashboard_acl.go

acl fixes

2017-06-22 17:10:43 -04:00

dashboard_snapshot.go

refactor(backend): refactoring management of go routines in backend

2016-09-28 21:06:00 +02:00

dashboard_version.go

refactoring: moved compare dashboard version command out of sqlstore, the code in this command did not use any sql operations and was more high level, could be moved out and use existing queries to get the versions

2017-06-06 00:15:40 +02:00

dashboards_test.go

dashboard folder search fix

2017-06-23 16:00:26 -04:00

dashboards.go

dashboard folder search fix

2017-06-23 16:00:26 -04:00

datasource_cache_test.go

Config Array Syntax (#8204)

2017-04-25 09:14:29 +02:00

datasource_cache.go

Use cache for http.client in tsdb package. (#6833)

2016-12-07 11:10:42 +01:00

datasource.go

mysql: improved mysql data source, added test feature when adding data source, fixed cache issue

2017-05-11 10:50:24 +02:00

health.go

feat: added api health endpoint that does not require auth and never creates sessions, returns db status as well. #3302

2017-04-25 17:17:45 +02:00

helpflags.go

ux(getting started): progress on getting started panel and persited help flag states, #6466

2016-11-09 10:41:39 +01:00

home_dashboard.go

Worked on home dashboard

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

models.go

grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415

2017-05-22 14:56:50 +02:00

notifications.go

fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093

2017-04-25 13:16:41 +02:00

org_user.go

Merge branch 'master' into develop

2017-08-14 10:30:36 +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

fix(playlist): fixed sorting issue with playlist playback, fixes #5467

2016-09-22 10:06:03 +02:00

plugin_settings.go

refactor(securejsondata): extract to class

2016-11-24 13:22:25 +01: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

server.go

tech(server): remove unused code

2017-02-17 10:18:11 +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

stats.go

feat: store last seen date for users and present in stats and user lists, closes #9007

2017-08-09 10:36:41 +02:00

streams.go

mergefix(): fixed issue with master merge

2017-01-31 09:00:36 +01:00

temp_user.go

signup: fix email sent logic for tempuser

2017-06-30 20:21:08 +02:00

test_data.go

mysql: minor progress on response processing

2017-03-31 11:45:25 +02:00

user_group_member.go

WIP: guardian service for search

2017-06-12 15:49:09 +02:00

user_group.go

dashfolders: fix user group picker + cleanup

2017-06-23 20:56:02 +02:00

user.go

Merge branch 'master' into develop

2017-08-14 10:30:36 +02:00