11005 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	a0bb58867a	Merge branch 'develop' into develop-newgrid-row-panels	2017-08-18 15:02:17 +02:00
Torkel Ödegaard	dc249cf945	fixed unit tests	2017-08-18 15:01:29 +02:00
Torkel Ödegaard	011c582ebb	minor user avatar stuff	2017-08-18 14:49:04 +02:00
Torkel Ödegaard	55c6b4b99c	started on rows as panels in single grid	2017-08-18 13:25:51 +02:00
Torkel Ödegaard	301ae2ea05	Merge branch 'develop' into develop-newgrid-rows	2017-08-18 08:57:33 +02:00
Torkel Ödegaard	d452d3ce93	minor user list cahnge	2017-08-18 08:34:10 +02:00
Torkel Ödegaard	02dc3c063c	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-08-18 08:17:44 +02:00
Torkel Ödegaard	bb7b55277c	users view update	2017-08-18 08:17:35 +02:00
Torkel Ödegaard	02bb92a126	Merge branch 'develop-ux-wip' of github.com:grafana/grafana into develop-newgrid-rows	2017-08-18 08:13:05 +02:00
Torkel Ödegaard	8817cc9aaf	ux: color tweaks	2017-08-17 21:32:23 +02:00
Matt	e79dbc7cec	Moved around the columns a bit	2017-08-17 19:02:48 +02:00
Torkel Ödegaard	7ed2ed71f0	ux: dashboard stuff	2017-08-17 18:50:46 +02:00
Torkel Ödegaard	637ff61f90	Merge branch 'develop' into develop-newgrid-rows	2017-08-17 15:56:38 +02:00
Torkel Ödegaard	11f6c4eb28	ux: minor changes	2017-08-17 15:52:22 +02:00
Torkel Ödegaard	4e66fd72d3	ux: sidemenu animation duration	2017-08-17 15:36:50 +02:00
Torkel Ödegaard	d4a231fe09	ux: fixed sidenav issues	2017-08-17 14:59:10 +02:00
Torkel Ödegaard	4dd4631b87	ux: sidemenu toggling	2017-08-17 14:00:41 +02:00
Torkel Ödegaard	6609dbff90	ux: sidenav fixes and dashboard search changes	2017-08-17 12:06:51 +02:00
Torkel Ödegaard	a4da0adf38	ux: switching orgs now works through modal	2017-08-16 15:37:13 +02:00
Torkel Ödegaard	95f5c84a57	ux: making org visibile in profile view	2017-08-16 15:03:49 +02:00
Torkel Ödegaard	7f0f0eb617	ux: more nav work	2017-08-16 11:28:52 +02:00
Torkel Ödegaard	5405736321	ux: nav fixes & polish	2017-08-15 23:17:34 +02:00
Torkel Ödegaard	d659a5d79f	ux: more nav work	2017-08-15 20:53:31 +02:00
Torkel Ödegaard	0bc226d760	ux: more nav work	2017-08-15 20:24:16 +02:00
Torkel Ödegaard	1eab771231	ux: navigation work	2017-08-15 17:52:52 +02:00
Torkel Ödegaard	db54416deb	ux: sidenav fixes and dashboard search changes	2017-08-15 15:25:18 +02:00
Torkel Ödegaard	6a1075cd02	Merge branch 'develop-ux-wip' of github.com:grafana/grafana into develop-ux-wip	2017-08-15 14:49:35 +02:00
Torkel Ödegaard	63424f9866	ux: more work on sidemenu	2017-08-15 14:49:12 +02:00
Matt	9aa8648736	Silly gradient added a placeholder. no more experimentation to be done here until Trent has a pass at it	2017-08-15 14:43:10 +02:00
Torkel Ödegaard	c65d92779f	Merge branch 'develop-ux-wip' of github.com:grafana/grafana into develop-ux-wip	2017-08-15 11:51:55 +02:00
Torkel Ödegaard	7bf6904119	ux: scrollbar stuff	2017-08-15 11:51:47 +02:00
Matt	b949f019cf	Added drop shadown for sticky scrolling, moved colors into dark and light variables	2017-08-15 11:04:26 +02:00
Matt	588f35ef4f	Reduced size of breadcrumbs, additional form styling. Colors still need to be adjusted	2017-08-15 10:54:13 +02:00
Matt	f68dc5ca23	Starting to play with new form styles	2017-08-15 09:48:35 +02:00
Torkel Ödegaard	547c61dc1a	ux: minor scroll fix	2017-08-15 09:46:38 +02:00
Torkel Ödegaard	27d6492f40	ux: removed custom scrollbar look	2017-08-15 09:10:39 +02:00
Torkel Ödegaard	521c33a7e6	ux: reduced size of sidemenu icons a bit	2017-08-14 22:47:04 +02:00
Torkel Ödegaard	e81cb9c929	ux: testing fixed sidemenu and breadcrumbs	2017-08-14 22:44:01 +02:00
Torkel Ödegaard	097fa74390	ux: minor navbar update	2017-08-14 21:43:24 +02:00
Torkel Ödegaard	8aa73401a9	ux: new breadcrumb progress	2017-08-14 19:47:40 +02:00
Torkel Ödegaard	8d6a1cdbb4	ux: wip	2017-08-14 18:11:35 +02:00
Torkel Ödegaard	78ea1dc87d	ux: new page header look wip	2017-08-14 16:06:20 +02:00
Torkel Ödegaard	8b87964344	ux: testing roboto font	2017-08-14 13:57:16 +02:00
Torkel Ödegaard	f02be0251b	ux: use flexbox for sidenav, put logo in sidenav	2017-08-14 12:26:24 +02:00
Torkel Ödegaard	1dab313ca3	Merge branch 'master' into develop	2017-08-14 10:30:36 +02:00
Torkel Ödegaard	17cb3f6e6a	fix: graph fix for decimals, bug introduced by #61313478063b0e0721f204847f3c0298ea8f593f	2017-08-11 16:20:36 +02:00
Torkel Ödegaard	d4dd0222fa	fix: prometheus does not have two editor modes, fixes #9025	2017-08-11 12:33:56 +02:00
Torkel Ödegaard	8f2975c69b	moving panels betwen rows are starting to work	2017-08-11 12:12:17 +02:00
Daniel Lee	167995776f	docs: update to tag alias ... ref #9024	2017-08-11 11:30:30 +02:00
Daniel Lee	02248273ae	mysqlds: remove alpha state from plugin.json	2017-08-11 10:25:37 +02:00