bergquist 6cd83e182a Merge branch 'master' into alerting_reminder ...

* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...

2018-06-15 12:45:35 +02:00

..

migrations

alerting: renames journal table to alert_notification_journal

2018-06-05 13:10:38 +02:00

migrator

Sqlstore refactor (#11908)

2018-05-18 11:10:10 +02:00

sqlutil

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

alert_notification_test.go

alerting: invert sendOnce to sendReminder

2018-06-05 10:44:17 +02:00

alert_notification.go

removes more unused code

2018-06-07 07:15:50 +02:00

alert_test.go

alerting: show alerts for user with Viewer role

2018-06-04 12:34:30 +03:00

alert.go

Revert changes post code review and move them to notification page

2018-06-04 13:19:14 +02:00

annotation_test.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

annotation.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

apikey_test.go

Added expire option to dashboard snapshots, #1623

2015-03-26 12:00:52 +01:00

apikey.go

Simplify comparison to bool constant (gosimple)

2018-04-16 21:04:57 +02:00

dashboard_acl_test.go

pkg/services: fix ineffassign issues

2018-04-23 19:28:54 +02:00

dashboard_acl.go

return inherited property for permissions

2018-04-23 09:23:14 +02:00

dashboard_folder_test.go

new property for current user indicating if edit permissions in folders

2018-04-30 15:34:31 +02:00

dashboard_provisioning_test.go

provisioning: simplify db query

2018-04-10 12:30:37 +02:00

dashboard_provisioning.go

provisioning: simplify db query

2018-04-10 12:30:37 +02:00

dashboard_service_integration_test.go

Merge branch 'master' into readonly_dashboards

2018-04-17 16:27:51 +02:00

dashboard_snapshot_test.go

Sqlstore refactor (#11908)

2018-05-18 11:10:10 +02:00

dashboard_snapshot.go

Simplify comparison to bool constant (gosimple)

2018-04-16 21:04:57 +02:00

dashboard_test.go

Outdent code after if block that ends with return (golint)

2018-04-27 23:10:43 +02:00

dashboard_version_test.go

dashboard version cleanup: more tests and refactor

2018-03-22 15:18:05 +03:00

dashboard_version.go

dashboard version cleanup: more tests and refactor

2018-03-22 15:18:05 +03:00

dashboard.go

new property for current user indicating if edit permissions in folders

2018-04-30 15:34:31 +02:00

datasource_test.go

Shouldn't be able to overwrite a dashboard if you don't have permissions (#10900)

2018-02-19 11:12:56 +01:00

datasource.go

bug: return correct err message

2018-02-14 13:32:52 +01: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

logger.go

dasboard_history: security fix, added orgId filter to dashboard version lookup

2017-06-07 14:21:40 +02:00

login_attempt_test.go

WIP: Protect against brute force (frequent) login attempts (#10031)

2018-01-26 10:41:41 +01:00

login_attempt.go

login: uses epochs for login throtting.

2018-02-16 17:25:46 +01:00

org_test.go

database: fixes after xorm update

2018-03-16 00:09:29 +01:00

org_users.go

teams: use orgId in all team and team member operations (#10862)

2018-02-09 17:26:15 +01:00

org.go

refactor: sqlstore inTransaction consolidated to one version, fixes #8376

2017-05-23 10:56:23 +02:00

playlist_test.go

chore(playlist): remove commented code

2016-01-29 20:33:01 +01:00

playlist.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

plugin_setting.go

Outdent code after if block that ends with return (golint)

2018-04-27 23:10:43 +02:00

preferences.go

Outdent code after if block that ends with return (golint)

2018-04-27 23:10:43 +02:00

quota_test.go

Sqlstore refactor (#11908)

2018-05-18 11:10:10 +02:00

quota.go

Simplify comparison to bool constant (gosimple)

2018-04-16 21:04:57 +02:00

search_builder_test.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

search_builder.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

shared.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

sql_test_data.go

refactor: sqlstore inTransaction consolidated to one version, fixes #8376

2017-05-23 10:56:23 +02:00

sqlbuilder.go

refactoring: alert rule query refactoring (#10941)

2018-02-16 13:56:04 +01:00

sqlstore.go

adds missing return statement

2018-06-06 22:17:19 +02:00

sqlstore.goconvey

feat(invite): small progress

2015-07-17 14:42:49 +02:00

star.go

refactor: sqlstore inTransaction consolidated to one version, fixes #8376

2017-05-23 10:56:23 +02:00

stars_test.go

Fixed gofmt formating, updated precommit hook

2015-03-07 16:37:19 +01:00

stats_test.go

add usage stats for datasource access mode

2018-05-25 16:06:35 +02:00

stats.go

use sql builder for the get system stats sql query

2018-05-28 10:37:17 +02:00

tables.go

Began work on real sql schema definitions, and migration engine

2015-01-17 21:40:22 +01:00

team_test.go

pkg/services: fix ineffassign issues

2018-04-23 19:28:54 +02:00

team.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00

temp_user_test.go

signup: fix email sent logic for tempuser

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

temp_user.go

Simplify comparison to bool constant (gosimple)

2018-04-16 21:04:57 +02:00

tls_mysql.go

generalized database connection cert support and added to postgres

2016-11-22 15:29:22 -08:00

user_auth_test.go

db: fix failing user auth tests for postgres

2018-04-23 16:02:59 +02:00

user_auth.go

refactor authproxy & ldap integration, address comments

2018-04-17 14:06:25 -04:00

user_test.go

Dashboard acl query fixes (#10909)

2018-02-14 15:04:26 +01:00

user.go

move database-specific code into dialects (#11884)

2018-05-10 16:54:21 +02:00