1634 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	0ab2113fab	docs(config): added missing smtp config section, fixes #6155	2016-09-30 07:40:58 +02:00
Torkel Ödegaard	50d146e82c	fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027	2016-09-29 14:53:50 +02:00
bergquist	1a062c52fa	fix(notifications): handle none configured image uploader ... ref #6152	2016-09-29 14:31:19 +02:00
Torkel Ödegaard	75311e0626	feat(alerting): removed old init package	2016-09-28 21:27:24 +02:00
Torkel Ödegaard	5f5bbfbda5	Merge branch 'master' of github.com:grafana/grafana	2016-09-28 21:12:37 +02:00
Torkel Ödegaard	80eb82420e	fix(cleanup): check if images dir exists	2016-09-28 21:12:25 +02:00
Torkel Ödegaard	c28d004731	Merge branch 'go_routines'	2016-09-28 21:06:07 +02:00
Torkel Ödegaard	71e2c6f6ef	refactor(backend): refactoring management of go routines in backend	2016-09-28 21:06:00 +02:00
Dan Cech	6d7061dcaf	fix typo in config loader	2016-09-28 13:10:31 -04:00
Torkel Ödegaard	2750c8a801	feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423	2016-09-28 15:27:08 +02:00
Torkel Ödegaard	3e657357e5	Merge branch 'gnet-oauth'	2016-09-28 15:11:03 +02:00
Torkel Ödegaard	e5fc4332cd	feat(oauth): refactoring PR #6077	2016-09-28 15:10:50 +02:00
bergquist	bc634f20d5	Merge branch 'master' into go_routines	2016-09-28 13:58:14 +02:00
bergquist	7a6501640f	tech(log): fixes extra param logging	2016-09-28 13:57:19 +02:00
bergquist	991539e410	style(go_routines): improve variable naming	2016-09-28 13:35:24 +02:00
Torkel Ödegaard	5ccdbf01fd	merge with master	2016-09-28 13:02:15 +02:00
Torkel Ödegaard	a4648607bb	feat(testdata): added csv test data scenario	2016-09-28 10:37:30 +02:00
Torkel Ödegaard	8d5857661e	refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers	2016-09-28 09:15:48 +02:00
Torkel Ödegaard	63caedb094	Merge branch 'master' of github.com:grafana/grafana	2016-09-28 08:09:51 +02:00
Torkel Ödegaard	460160cfa4	feat(testdata): added test case for ms resolution data	2016-09-28 08:08:46 +02:00
Torkel Ödegaard	22e8885690	feat(testdata): progress on test data stuff	2016-09-27 18:36:00 +02:00
Torkel Ödegaard	3ecd96e682	feat(testdata): lots of work on new test data data source and scenarios	2016-09-27 18:17:39 +02:00
bergquist	34b31aeef8	tech(goroutines): sync state between different go routines	2016-09-27 16:47:17 +02:00
bergquist	8e89173095	tech(log): fixes extra param logging	2016-09-27 16:06:06 +02:00
Torkel Ödegaard	ade8aa5b92	feat(graph): refactorings	2016-09-27 14:47:04 +02:00
Torkel Ödegaard	34f15d92d0	feat(testdata): worked on testdata app	2016-09-27 14:39:51 +02:00
bergquist	262e7193a3	feat(alerting): keep proccessing results even if one response panics	2016-09-27 11:16:55 +02:00
bergquist	071f2205e1	tech(tsdb): ops <o>	2016-09-27 11:13:13 +02:00
bergquist	46d4f817e3	tech(graphite): return error if statuscode is not ok	2016-09-27 10:09:56 +02:00
bergquist	dbb7852f21	feat: purge old files and snapshots ... closes #4087 closes #2172	2016-09-26 14:33:40 +02:00
bergquist	1a32ab64b6	tech(renderer): improve renderOpts names	2016-09-26 11:07:36 +02:00
bergquist	effd2098ee	feat(alerting): fixes broken image renderer	2016-09-26 10:51:45 +02:00
bergquist	887e236bce	fix(rule): fixes rule reading bug	2016-09-26 10:01:33 +02:00
bergquist	8cd9225eb6	feat(alerting): increase timeout to 15s	2016-09-26 08:45:55 +02:00
Dan Cech	501e67a657	use semver when comparing grafana and plugin versions (#6108)	2016-09-23 14:38:59 +02:00
Torkel Ödegaard	9a94072c1d	Merge branch 'master' of github.com:grafana/grafana	2016-09-23 12:30:20 +02:00
Torkel Ödegaard	175c651e65	fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906	2016-09-23 12:29:53 +02:00
bergquist	99c77e7df8	tech(plugins): increase timeout	2016-09-23 09:56:42 +02:00
bergquist	e5c64732f1	fix(sql): Add boolstr to all dialects ... closes #6116	2016-09-23 09:36:15 +02:00
Carl Bergquist	696a5f6a80	Merge pull request #6113 from replay/fix_context_dependency ... Fix context dependency	2016-09-23 06:43:32 +02:00
Mauro Stettler	cb0f19f8d4	fix context dependency	2016-09-22 21:13:08 +01:00
Carl Bergquist	7bfef0ced8	Merge pull request #6111 from grafana/pluginreadme ... allow non-admin users to view plugin readme	2016-09-22 21:12:44 +01:00
Mauro Stettler	b063cf0a6e	fix typo	2016-09-22 20:44:57 +01:00
Carl Bergquist	d6a0ec85c4	Merge pull request #6111 from grafana/pluginreadme ... allow non-admin users to view plugin readme	2016-09-22 19:51:47 +02:00
Dan Cech	2c3dd84ebb	allow non-admin users to view plugin readme	2016-09-22 13:46:11 -04:00
bergquist	d711c0ed35	Merge branch 'master' into alert_prometheus	2016-09-22 19:27:24 +02:00
bergquist	a49c21df3a	fix(png-renderer): increase timeouts	2016-09-22 19:24:18 +02:00
bergquist	76b8cff445	fix(gnet): remove trailing ,	2016-09-22 16:17:22 +02:00
Torkel Ödegaard	f79600b352	fix(internal metrics): removed local dev code	2016-09-22 11:54:47 +02:00
Torkel Ödegaard	e336fb3d60	fix(smtp mailer): added timeout of 10 seconds to smpt mailer, fixes #2989	2016-09-22 11:51:39 +02:00