bergquist ffda5efc66 Merge branch 'master' into alerting_reminder ...

* master:
  changelog: add notes about closing #11076
  snapshot: copy correct props when creating a snapshot
  set current org when adding/removing user to org
  changelog: add notes about closing #10707
  Include the vendor directory when copying source in to Docker (#12305)
  changelog: adds note about closing #12199
  adds inTransactionCtx that calls inTransactionWithRetryCtx
  merge create user handlers
  transactions: start sessions and transactions at the same place
  cloudwatch: handle invalid time range
  make sure to use real ip when validating white listed ip's
  changelog: adds note about closing #12286

2018-06-18 11:26:31 +02:00

..

migrations

use epoch to compare timestamp

2018-06-16 00:03:13 +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

adds tests for journaling sql operations

2018-06-16 11:27:04 +02:00

alert_notification.go

adds tests for journaling sql operations

2018-06-16 11:27:04 +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

sql: adds tests for InTransaction

2018-06-15 12:46:20 +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

merge create user handlers

2018-06-15 21:23:57 +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

Merge pull request #12263 from grafana/11076_current_org

2018-06-18 11:19:42 +02:00

org_users.go

set current org when adding/removing user to org

2018-06-18 09:30:01 +02: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

session.go

transactions: start sessions and transactions at the same place

2018-06-15 20:52:57 +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

sql: adds tests for InTransaction

2018-06-15 12:46:20 +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

bus: dont mix ctx/classic handlers

2018-06-15 12:46:20 +02:00

stats.go

bus: dont mix ctx/classic handlers

2018-06-15 12:46:20 +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

merge create user handlers

2018-06-15 21:23:57 +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

transactions_test.go

transactions: start sessions and transactions at the same place

2018-06-15 20:52:57 +02:00

transactions.go

adds inTransactionCtx that calls inTransactionWithRetryCtx

2018-06-15 21:57:13 +02:00

user_auth_test.go

merge create user handlers

2018-06-15 21:23:57 +02:00

user_auth.go

refactor authproxy & ldap integration, address comments

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

user_test.go

Merge pull request #12263 from grafana/11076_current_org

2018-06-18 11:19:42 +02:00

user.go

Merge pull request #12263 from grafana/11076_current_org

2018-06-18 11:19:42 +02:00