857 Commits

Author	SHA1	Message	Date
Trent White	2a32d01bd5	replace icon on dashboard list (fa-th-large - looked squished) with a smaller version of dashbord icon. This may not be the best way to do the css, so it's a separate commit	2017-12-13 17:51:01 -05:00
Trent White	e2bbb85daa	new icons created and added to nav	2017-12-13 17:48:44 -05:00
Torkel Ödegaard	26b8483fb0	teams: Fixes to edit team page	2017-12-13 18:20:49 +01:00
Torkel Ödegaard	6254304667	Merge remote-tracking branch 'origin/select-wrapper' into develop	2017-12-13 18:12:35 +01:00
Patrick O'Carroll	c63569b6ce	made template link look like input (#10198)	2017-12-13 18:01:06 +01:00
Torkel Ödegaard	1eeb421ddb	ux: updated login page	2017-12-13 17:46:14 +01:00
Torkel Ödegaard	8ea94817f5	build: fixed build issue	2017-12-13 16:56:24 +01:00
Torkel Ödegaard	aa4f1fa971	Merge remote-tracking branch 'origin/9879-login' into develop-login2	2017-12-13 16:06:17 +01:00
Torkel Ödegaard	313735bd75	search: worked on search results	2017-12-13 15:51:59 +01:00
Patrick O'Carroll	3b783216fa	added select-wrapper to where it was missing for unified look	2017-12-13 15:05:43 +01:00
Johannes Schill	c433597f99	Merge branch 'develop' into 9879-login	2017-12-13 14:21:39 +01:00
Johannes Schill	b8bfe51b03	ux: wip - Login animation POC (#9879)	2017-12-13 14:20:07 +01:00
Johannes Schill	0be9789364	ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling (#9879)	2017-12-13 13:51:52 +01:00
Torkel Ödegaard	ccbd18006e	ux: org user management changes	2017-12-13 13:16:44 +01:00
Marcus Efraimsson	c6a02bec81	dashfolders: Minor css fixes for bulk edit	2017-12-13 11:08:28 +01:00
Marcus Efraimsson	a9ba7b912f	dashfolders: Minor css fixes for bulk edit	2017-12-13 10:59:29 +01:00
Torkel Ödegaard	d3858d8847	ux: fixed inactive view mode and removed animation	2017-12-13 09:49:24 +01:00
Johannes Schill	6a2b1e52b2	Merge branch 'develop' into 9879-login	2017-12-13 09:22:48 +01:00
Torkel Ödegaard	05cc1f85c3	Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team	2017-12-12 17:07:00 +01:00
Alexander Zobnin	8aaaee5e16	fix colorpicker colors order (width issue) (#10170)	2017-12-12 17:00:56 +01:00
Torkel Ödegaard	271c597c9b	ux: style tweaks	2017-12-12 15:13:47 +01:00
Johannes Schill	01e9053625	ux: Update ui of login buttons via third parties and add link to sign up page (#9879)	2017-12-12 15:00:04 +01:00
Torkel Ödegaard	d379b501aa	ux: search look update	2017-12-12 13:55:32 +01:00
Torkel Ödegaard	df25c9f0fa	tech: updated version for react-grid item	2017-12-12 13:27:56 +01:00
Torkel Ödegaard	bbd0b98be9	Merge branch 'develop-settings' into develop	2017-12-12 12:03:10 +01:00
Torkel Ödegaard	7b0bbefb96	ux: minor updates to dashboard settings	2017-12-12 12:02:44 +01:00
Torkel Ödegaard	0a8bd5d289	ux: dashboard settings updated	2017-12-12 11:49:01 +01:00
Patrick O'Carroll	515faa9ec5	new dashboard and folder in search (#10152) ... * new dashboard and folder in search * code formatting fixes	2017-12-12 11:26:15 +01:00
Johannes Schill	097596a336	ux: Adjust margins when external auth providers are enabled (#9879)	2017-12-11 17:22:40 +01:00
Johannes Schill	f77d34f7c9	ux: wip - Push pixels for new login, remove inline styling, change so we use media queries using min-width instead of max-width and make sure it looks ok across all screen sizes (#9879)	2017-12-11 16:31:50 +01:00
Torkel Ödegaard	61dbcfd35b	ux: dashboard settings progress	2017-12-11 13:29:23 +01:00
Torkel Ödegaard	05ec7541c8	ux: dashboard settings progress	2017-12-11 13:04:06 +01:00
Torkel Ödegaard	8354c64ff5	Merge branch 'develop' into develop-settings	2017-12-11 12:15:59 +01:00
Torkel Ödegaard	09cc60ffe4	ux: dashboard settings progress	2017-12-11 12:13:45 +01:00
Torkel Ödegaard	795d9c0362	ux: fixed navbar and sidemenu z-index issue and improved responsive rules	2017-12-11 11:42:13 +01:00
Torkel Ödegaard	84aa1e89c0	Merge branch 'develop' into develop-login	2017-12-11 10:29:37 +01:00
Torkel Ödegaard	502171fff1	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-12-11 09:18:03 +01:00
Torkel Ödegaard	511fa7dec1	ux: dashboard settings progress	2017-12-10 12:41:11 +01:00
Torkel Ödegaard	00c723f04a	ux: minor changes	2017-12-10 12:21:04 +01:00
Torkel Ödegaard	e1440dcc44	ux: navbar progress	2017-12-09 22:45:33 +01:00
Torkel Ödegaard	1e5983b46c	Merge branch 'develop' into develop-settings	2017-12-09 21:50:26 +01:00
Torkel Ödegaard	7f73fae6ae	ux: form styles polish, improvement but can be better	2017-12-09 21:46:30 +01:00
Torkel Ödegaard	fbe9f759ad	ux: work on dashboard settings views	2017-12-08 18:15:24 +01:00
Alexander Zobnin	9e62a777c7	refactor: user groups to teams, rename frontend files	2017-12-08 18:47:55 +03:00
Alexander Zobnin	d8612380e9	refactor: rename User Groups to Teams	2017-12-08 18:25:45 +03:00
Torkel Ödegaard	7a2e886e70	Merge branch 'develop' into develop-settings	2017-12-08 16:02:42 +01:00
Torkel Ödegaard	10a77b0353	ux: forms style font size change	2017-12-08 15:59:51 +01:00
Torkel Ödegaard	1b6be031e5	ux: dashboard settings progress	2017-12-08 15:53:26 +01:00
Torkel Ödegaard	db663c380b	new timepicker is working	2017-12-08 14:38:33 +01:00
Torkel Ödegaard	9369a87e93	Merge branch 'develop' into develop-settings	2017-12-08 14:32:15 +01:00