15030 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	d440b9a8d1	registry: adds more comments	2018-06-29 11:58:54 +02:00
bergquist	f0f6d0e915	registry: adds comments to interfaces	2018-06-29 11:45:32 +02:00
Marcus Efraimsson	cb706bd059	changelog: update ... [skip ci]	2018-06-29 10:52:42 +02:00
Marcus Efraimsson	32793350b8	changelog: update ... [skip ci]	2018-06-29 10:49:36 +02:00
Marcus Efraimsson	0dd0b65900	changelog: add notes about closing #12438 ... [skip ci]	2018-06-29 10:48:50 +02:00
Marcus Efraimsson	59756863df	Merge pull request #12439 from grafana/fix-log-close-too-early ... Fix: Log close (ie flush) was done too early, before final shutdown log	2018-06-29 10:45:14 +02:00
bergquist	c4292b43f5	alerting: only log when screenshot been uploaded	2018-06-29 09:58:58 +02:00
bergquist	ce88e4b927	fixes typos ... closes #12453	2018-06-29 09:35:31 +02:00
Marcus Efraimsson	fb2b2c9f65	changelog: add notes about closing #12444 ... [skip ci]	2018-06-28 16:39:38 +02:00
Marcus Efraimsson	d226383c4e	Merge pull request #12444 from grafana/revert-12299-10707_whitelist ... Revert "auth proxy: use real ip when validating white listed ip's"	2018-06-28 16:31:26 +02:00
Marcus Efraimsson	8af5da7383	Revert "auth proxy: use real ip when validating white listed ip's"	2018-06-28 15:43:33 +02:00
Daniel Lee	7a2be69abc	changelog: adds note for #11892	2018-06-28 14:46:40 +02:00
Daniel Lee	8537f10285	Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option ... Make colorization of prefix and postfix optional in singlestat	2018-06-28 14:42:48 +02:00
Marcus Efraimsson	4c4bd2ebba	changelog: add notes about closing #12430 ... [skip ci]	2018-06-28 14:27:41 +02:00
Marcus Efraimsson	ab458061e6	Merge pull request #12441 from grafana/12430_fix ... Fix footer CSS issue	2018-06-28 14:25:08 +02:00
Marcus Efraimsson	54420363d3	fix footer css issue	2018-06-28 14:02:42 +02:00
Tobias Skarhed	af0a4a6039	Karma to Jest: 3 test files (#12414) ... * Karma to Jest: viewstate_srv * Karma to Jest: annotations_srv * Remove comments * Karma to Jest: series_override_ctrl * Remove unnecessary code * Class to function and fix lint error * Fix ngInject	2018-06-28 04:43:23 -07:00
Torkel Ödegaard	7a7c6f8fab	fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438	2018-06-28 04:38:23 -07:00
Tobias Skarhed	443ff5deb4	Karma to Jest: value_select_dropdown (#12435) ... * Begin Karma 2 Jest: value_select_dropdown * Add return for Promise * Remove Karma test	2018-06-28 03:10:36 -07:00
Dan Cech	3056d9a80e	support passing api token in Basic auth password (#12416)	2018-06-28 03:08:32 -07:00
Tobias Skarhed	c2381f088f	Add disabled styles for checked checkbox (#12422)	2018-06-28 03:02:49 -07:00
Marcus Efraimsson	3cf6a1a94b	changelog: add notes about closing #11920 ... [skip ci]	2018-06-27 15:17:15 +02:00
Marcus Efraimsson	18032b374b	changelog: add notes about closing #11920 ... [skip ci]	2018-06-27 15:11:44 +02:00
Marcus Efraimsson	f1ab1a26e9	changelog: update ... [skip ci]	2018-06-27 14:48:55 +02:00
Marcus Efraimsson	6fa87e6278	docs: upd what's new in v5.2	2018-06-27 14:20:36 +02:00
Marcus Efraimsson	b011444246	release 5.2.0	2018-06-27 11:39:04 +02:00
Marcus Efraimsson	e378f6db88	docs: update index with link to what's new in 5.2 instead of 5.0	2018-06-27 11:35:53 +02:00
Marcus Efraimsson	ec3a4e105f	changelog: add notes about closing #12385 ... [skip ci]	2018-06-26 18:11:56 +02:00
Marcus Efraimsson	06daae2179	Merge pull request #12412 from grafana/12393_login ... login: fix layout issues	2018-06-26 18:01:54 +02:00
Marcus Efraimsson	8d535dd90d	docs: upd what's new in v5.2 ... [skip ci]	2018-06-26 15:42:34 +02:00
Marcus Efraimsson	e256c61b54	docs: upd what's new in v5.2	2018-06-26 15:37:22 +02:00
Marcus Efraimsson	9f02927761	login: fix layout issues	2018-06-26 15:19:57 +02:00
Marcus Efraimsson	bd805544c5	build: yarn should be included out of the box on circle ci	2018-06-26 15:19:04 +02:00
Augustin	ef0bf9f701	ensure that if the dasboardID is negative, it will not bypass the checking of the right (#12398)	2018-06-26 05:12:20 -07:00
Marcus Efraimsson	5a2cf5863d	Merge pull request #12399 from grafana/12140_docs ... docs: update installation instructions	2018-06-26 10:37:22 +02:00
Marcus Efraimsson	db12e8d52d	changelog: add notes about closing #11968 ... [skip ci]	2018-06-26 10:32:32 +02:00
Marcus Efraimsson	ceba0490f8	Merge pull request #12395 from grafana/11968_variable_key_value ... Set correct text in drop down when variable is present in url	2018-06-26 10:29:21 +02:00
Torkel Ödegaard	713a87fb5b	Webpack 4 (WIP) (#12098) ... * Webpack 4 * webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker * Webpack 4 * webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker * upgrade ts loader * simplified splitChunks * upgrade circle node image to v8 * webpack: minor changes, using the new mode option, removed unused awesome-typescript loader, investigating karma issue but no solution yet * fix: change angular mocks version restriction to be more strict * add babel-loader for HMR support, fix karma debug runner * babel-loader to yarn.lock * webpack: changed from ExtractTextPlugin to MiniCssExtractPlugin, and updated the minification step to use new webpack4 optimization config section * webpack: remove css minifcation from general css processing as it's done in the webpack optimization step * limit vendors chunk to .ts and .js files * fix: removed typescript compile error, wanted to see if we still got test failure for that * tech: upgrade uglify-js, should be faster now	2018-06-26 01:28:37 -07:00
Aman	e11f6f5cdf	Make pre/postfix coloring checkboxes inactive when gauge is active	2018-06-26 13:06:26 +05:30
bergquist	f83306bb5b	removes unused return object	2018-06-26 09:22:31 +02:00
Dan Cech	583df47c2f	handle "dn" ldap attribute more gracefully (#12385) ... * handle "dn" ldap attribute more gracefully * use strings.ToLower	2018-06-26 00:14:55 -07:00
Torkel Ödegaard	dd7a653db9	Update ROADMAP.md	2018-06-26 08:59:37 +02:00
Carl Bergquist	1165d098b0	Merge pull request #12407 from pengwk/patch-1 ... Fix typo	2018-06-26 08:30:05 +02:00
peng weikang	e4669681c4	Fix typo	2018-06-26 14:04:54 +08:00
Marcus Efraimsson	31239f33ed	docs: update installation instructions	2018-06-25 17:22:31 +02:00
Carl Bergquist	175e95abb0	Merge pull request #12396 from bergquist/routing ... routing: allows routes to be added to existing groups	2018-06-25 17:17:14 +02:00
bergquist	4a46dd886b	routing: raise panic if duplicate routes are added	2018-06-25 16:58:49 +02:00
bergquist	dbfafa1cb5	routing: allows routes to be added to existing groups ... this enables services to add routing to ex /api without causing conflicts.	2018-06-25 16:50:27 +02:00
Marcus Efraimsson	c23f9a1f37	changelog: add notes about closing #11868 ... [skip ci]	2018-06-25 16:32:32 +02:00
Marcus Efraimsson	2b3bfd2f65	Merge pull request #12198 from grafana/11868_missing_phantom ... enhance error message if phantomjs executable is not found	2018-06-25 16:27:12 +02:00