Torkel Ödegaard 0e44fe082b Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

..

migrations

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

migrator

Corrected a PostgreSQL SELECT statement. (#9460)

2017-10-08 20:37:16 +02:00

sqlutil

mysql: use collation instead of charset (#9156)

2017-09-04 12:32:07 +02:00

alert_notification_test.go

tech(notifications): splitt into 3 queries

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

alert_notification.go

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

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

alert_test.go

refactoring dashoard folder guardian

2017-06-17 18:24:38 -04:00

alert.go

refactor: changed string slicing to strings.TrimPrefix, #9862

2017-11-15 10:48:03 +01:00

annotation_test.go

fix: return id from api when creating new annotation/graphite annotation, fixes #9798

2017-11-16 16:19:01 +01:00

annotation.go

annotations: quote reserved fields (#9550)

2017-10-17 11:03:19 +02:00

apikey_test.go

Added expire option to dashboard snapshots, #1623

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

apikey.go

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

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

dashboard_acl_test.go

dashfolders: inherited permissions for dashboards

2017-06-24 03:50:22 +02:00

dashboard_acl.go

dashfolders: inherited permissions for dashboards

2017-06-24 03:50:22 +02:00

dashboard_snapshot_test.go

feat(plugins): dashboard import for data sources is working! #4298

2016-03-12 10:13:49 +01:00

dashboard_snapshot.go

snapshots: improve snapshot listing performance, #9314 (#9477)

2017-10-10 14:25:19 +02:00

dashboard_test.go

search: fix search to limit dashboards better

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

dashboard_version_test.go

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

dashboard_version.go

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

dashboard.go

search: fix search to limit dashboards better

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

datasource_test.go

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

datasource.go

datasource as cfg: support globbing

2017-11-15 14:30:32 +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

org_test.go

acl fixes

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

org_users.go

Merge branch 'master' into develop

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

playlist: fixed dashboard play ordering, fixes #7688

2017-05-24 13:21:43 +02:00

plugin_setting.go

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

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

preferences.go

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

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

quota_test.go

add unittests for quota sqltore methods.

2015-09-15 17:10:46 +08:00

quota.go

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

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

shared.go

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

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

sql_test_data.go

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

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

sqlstore.go

Update the config key to database_log_queries so it is more descriptive, as suggested in #9785.

2017-11-06 08:01:31 -06: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.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

tables.go

Began work on real sql schema definitions, and migration engine

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

temp_user_test.go

signup: fix email sent logic for tempuser

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

temp_user.go

signup: fix email sent logic for tempuser

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

tls_mysql.go

generalized database connection cert support and added to postgres

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

user_group_test.go

acl fixes

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

user_group.go

dashfolders: fix user group picker + cleanup

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

user_test.go

acl fixes

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

user.go

Merge branch 'master' of github.com:grafana/grafana into develop

2017-10-11 16:47:16 +02:00