Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions ...

Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go

2016-06-07 13:31:56 +02:00

..

migrations

feat(alerting): requests looks to be working again

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

migrator

feat(logging): added loging filters

2016-06-07 12:11:41 +02:00

sqlutil

Added expire option to dashboard snapshots, #1623

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

alert_heartbeat_test.go

tech(alerting): change from array to map

2016-05-23 17:04:57 +02:00

alert_rule_changes_test.go

feat(alerting): requests looks to be working again

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

alert_rule_changes.go

feat(alerting): things are compiling and tests pass

2016-06-06 13:50:47 +02:00

alert_rule_test.go

feat(alerting): requests looks to be working again

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

alert_rule.go

feat(alerting): things are compiling and tests pass

2016-06-06 13:50:47 +02:00

alert_state_test.go

feat(alerting): requests looks to be working again

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

alert_state.go

feat(alerting): set basic description text of status ok

2016-05-31 20:03:15 +02:00

apikey_test.go

Added expire option to dashboard snapshots, #1623

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

apikey.go

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

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

dashboard_parser_test.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +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

Minor bug fixes

2016-01-19 05:05:24 -08:00

dashboard_test.go

test(dashboard): add failing test for deleting dashboards

2016-04-25 08:46:15 +02:00

dashboard.go

feat(alerting): move alert deletion to alert code

2016-04-26 15:48:29 +02:00

datasource_test.go

Restored sql integration tests to use in mem sqlite3

2015-04-23 16:21:49 +02:00

datasource.go

feat(alerting): requests looks to be working again

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

org_test.go

Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014

2015-05-19 11:47:14 +02:00

org_users.go

feat(invite): handling of existing org user case when inviting, #2353

2015-07-21 12:18:11 +02:00

org.go

fix(logging): removed temp dev logging code

2015-09-08 14:32:25 +02:00

playlist_test.go

chore(playlist): remove commented code

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

playlist.go

style(playlist): move dashboard access to dashboard.go

2016-01-29 01:41:23 +01:00

plugin_setting.go

allow updates to secureJsonData.

2016-04-28 18:39:23 +08:00

preferences.go

Add new parameter to config: default_theme.

2016-05-12 18:21:11 +03:00

quota_test.go

add unittests for quota sqltore methods.

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

quota.go

move toMap function to be a method on the quota structs

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

shared.go

Changed go package path

2015-02-05 10:37:13 +01:00

sqlstore.go

feat(logging): progress on new logging #4590

2016-06-07 09:29:47 +02:00

sqlstore.goconvey

feat(invite): small progress

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

star.go

Changed go package path

2015-02-05 10:37:13 +01:00

stars_test.go

Fixed gofmt formating, updated precommit hook

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

stats.go

fix(): admin stats and postgres

2016-04-11 18:16:35 -04: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

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

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

temp_user.go

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

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

tls_mysql.go

gofmt

2015-12-22 13:10:34 +00:00

user.go

Initial patch for grafana/grafana#4267 (#5280)

2016-06-06 07:15:37 +02:00