1682 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	3f945e886b	merge sync with master	2016-01-31 19:51:23 +01:00
Torkel Ödegaard	931d7cd039	Merge branch 'master' into panelbase	2016-01-31 16:57:04 +01:00
Torkel Ödegaard	3f5b33b060	css(): minor tweaks to navbar and timepicker margins/paddings	2016-01-31 11:38:38 +01:00
Torkel Ödegaard	fa63d26485	feat(timepicker): added validation to timepicker, and validation state to apply button, fixes #3870	2016-01-31 11:30:18 +01:00
Torkel Ödegaard	d617d029d2	fix(css): fixed issues introduced in recent sidemenu enhancements, fixes #3893, fixes #3894	2016-01-30 12:55:47 -05:00
Pablo Fischer	98082a940c	Allow the use of auth and credentials in opentsdb	2016-01-30 01:09:55 +00:00
Torkel Ödegaard	12460af0ec	Merge pull request #3830 from raintank/apiPlugin ... Add secureJsonData field to appSettings model	2016-01-29 17:17:37 -05:00
Torkel Ödegaard	9ec3216ab0	Merge branch 'master' of github.com:grafana/grafana	2016-01-29 16:52:44 -05:00
Torkel Ödegaard	92c2f8d556	feat(pinned sidemenu): completed side menu pinned stuff	2016-01-29 16:52:30 -05:00
bergquist	eef506d8c4	tests(playlist): add more test for playlist ui	2016-01-29 22:31:53 +01:00
Daniel Lee	7f15e2c167	Merge pull request #3889 from grafana/dashboard-share-menu ... New dropdown menu to surface the snapshot feature, basic styling in p…	2016-01-29 21:58:05 +01:00
Torkel Ödegaard	03aea09ce9	feat(pinned): updated	2016-01-29 15:49:13 -05:00
Daniel Lee	2897f618a6	Merge pull request #3880 from vitorboschi/fix3877 ... add default value for fill policy	2016-01-29 21:44:08 +01:00
Torkel Ödegaard	5f2aba6c5b	feat(sidemenu): pinned state	2016-01-29 15:36:41 -05:00
Daniel Lee	21632d22ab	Merge pull request #3882 from bergquist/playlist_tags ... Add support for playlist based on tags	2016-01-29 21:32:58 +01:00
Matt Toback	f59f6a5486	Standardized on fa-link icon for Link instead of external-link, which generally means Open In New Window or Go Offsite	2016-01-29 15:27:42 -05:00
Torkel Ödegaard	32989f4cca	Merge branch 'master' into pinned	2016-01-29 15:13:35 -05:00
Torkel Ödegaard	b5ef793ae4	feat(sidemenu): pinned work started	2016-01-29 15:12:56 -05:00
Trent White	339e73ee3d	change file names to remove the rt reference in the icon files	2016-01-29 13:57:48 -05:00
Trent White	6da3f87736	use svg icon instead of png file	2016-01-29 12:52:29 -05:00
Trent White	6ae464f33a	add rt-fonts file and point refs to snapshot icon to it	2016-01-29 12:46:57 -05:00
Anthony Woods	2e9272c778	Merge remote-tracking branch 'upstream/master' into apiPlugin	2016-01-30 01:38:01 +08:00
Matt Toback	6fe850e2c1	New dropdown menu to surface the snapshot feature, basic styling in place. Want to extend menu to include summary text of each feature	2016-01-29 11:48:57 -05:00
Vitor Boschi	bb3360e92a	add default value for fill policy	2016-01-29 07:50:30 -02:00
bergquist	5a4e48fa99	style(playlist_spec): rename to underscore standard	2016-01-29 02:42:23 +01:00
bergquist	35071649e0	tests(playlist): refactor playlist edit ctrl	2016-01-29 02:37:07 +01:00
Torkel Ödegaard	05e8c576a2	feat(panels): updated influxdb editor to use panelCtrl	2016-01-28 19:07:53 -05:00
bergquist	ea7c2e73ad	style(playlist): remove console logging	2016-01-29 00:38:50 +01:00
bergquist	b6f276265d	style(playlist): remove semi colons for functions in TS	2016-01-29 00:13:29 +01:00
Torkel Ödegaard	3c3d3c9ec6	feat(): fixed share modal	2016-01-28 18:05:49 -05:00
Torkel Ödegaard	34141363ae	feat(panels): fixed panel time	2016-01-28 17:17:56 -05:00
bergquist	3ccf7c8006	feat(playlist): improve the look of tag playlist items	2016-01-28 23:04:22 +01:00
Torkel Ödegaard	56c76f380b	feat(panels): fixes	2016-01-28 16:48:37 -05:00
bergquist	f36ade2959	chore(playlist): cleanup some code	2016-01-28 22:43:54 +01:00
bergquist	85ad5f1d37	Merge branch 'master' into playlist_tags	2016-01-28 22:32:59 +01:00
bergquist	64fa9a6394	fix(singlestat): add ngInject for controller ... fixes #3879	2016-01-28 22:27:17 +01:00
Torkel Ödegaard	9914714eeb	removed npm frontend assets from repo, installed using npm install postinstall script	2016-01-28 14:37:24 -05:00
Torkel Ödegaard	600ffa727e	feat(panels): fixes	2016-01-28 14:19:24 -05:00
bergquist	a7de2ceae4	feat(playlist): basic UI support for tags	2016-01-28 20:06:50 +01:00
Torkel Ödegaard	9bd3b417c4	feat(panels): upgraded table panel to latest plugin model	2016-01-28 12:48:43 -05:00
Torkel Ödegaard	a985f21d44	Merge pull request #3849 from pfischermx/master ... Send OpenTSDB POST request as urlencoded	2016-01-28 09:53:16 -05:00
utkarshcmu	b30dcce4bc	Added dtos and UI for more metadata	2016-01-28 00:52:52 -08:00
utkarshcmu	753fd164d7	Added createdBy in metadata ui and dashboard table	2016-01-27 17:11:21 -08:00
Torkel Ödegaard	307c86fc28	feat(panels): fixed singlestat tests	2016-01-27 19:16:33 -05:00
bergquist	72a64388b5	fix(tests): remove only in spec	2016-01-28 01:14:12 +01:00
bergquist	1210fca8e5	fix(singlestat): fix bug in threshold calculations	2016-01-28 01:11:52 +01:00
Torkel Ödegaard	97ac81aa9c	feat(panels): upgradede singlestat panel	2016-01-27 19:07:39 -05:00
Torkel Ödegaard	57d22fb93f	Merge remote-tracking branch 'origin/master' into panelbase	2016-01-27 17:33:33 -05:00
Torkel Ödegaard	f0f7da9ff0	feat(panels): fixing broken stuff	2016-01-27 17:16:00 -05:00
Torkel Ödegaard	9c1217cd2c	updated	2016-01-27 14:32:19 -05:00