149 Commits

Author	SHA1	Message	Date
bergquist	a08809f8fe	fix(phantomjs): upgrades to 2.1.1 for ssl support ... closes #4371	2016-03-16 16:30:08 +01:00
Torkel Ödegaard	f4666df7da	Merge branch 'master' of github.com:grafana/grafana	2016-03-07 18:04:06 +01:00
Torkel Ödegaard	4cd4ce504d	feat(plugins): worked on markdown support for plugin page, #4275	2016-03-07 18:03:45 +01:00
bergquist	b912edbbef	feat(grunt): add autoprefix with postcss ... closes #4250	2016-03-07 17:49:47 +01:00
Torkel Ödegaard	2cf1193b56	Merge branch 'variable-value-formatting-rethink'	2016-03-01 19:13:11 +01:00
Torkel Ödegaard	f3ad71d751	feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now	2016-03-01 08:43:54 +01:00
Matt Toback	efe25db40f	Update repo in package.json to point to official	2016-03-01 11:25:54 +08:00
Torkel Ödegaard	363f36dfae	ux(): tweaks	2016-02-21 15:21:01 +01:00
Torkel Ödegaard	f3fe1a5320	fix(build): trying to fix build	2016-02-20 17:54:51 +01:00
Torkel Ödegaard	d0d21ba9a6	ux(): updated orange color and fixed sidemenu background on dark theme	2016-02-19 15:33:24 +01:00
Torkel Ödegaard	c21b353042	ux(): color/grays palate refactoring	2016-02-19 12:26:59 +01:00
Torkel Ödegaard	f8e233e400	commit(): saas changs	2016-02-15 15:27:41 +01:00
Torkel Ödegaard	f7e3297a0f	ux(): updated navbar on all pages to new style, no subnav/dropdown yet though	2016-02-13 14:32:20 +01:00
Torkel Ödegaard	e7a202fe4d	Merge branch 'master' into style-changes-bulletfactory	2016-02-12 10:14:06 +01:00
Torkel Ödegaard	f797b19825	fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003	2016-02-12 09:58:00 +01:00
Torkel Ödegaard	2ea548850e	Merge branch 'master' into style-changes-bulletfactory ... Conflicts: pkg/api/index.go public/less/sidemenu.less	2016-02-11 21:23:54 +01:00
Torkel Ödegaard	ae39ec8585	feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk	2016-02-10 13:09:39 +01:00
Matthew Toback	21b0945d08	Beginnings of form restyling, nowhere near merge yet	2016-02-06 17:37:33 -05:00
Torkel Ödegaard	714129c8e3	fix(): package.json use local grunt in postinstall script	2016-02-04 22:44:25 +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	6fae264222	feat(plugins): upgraded influxdb to new plugin format	2016-01-14 15:35:14 +01:00
Torkel Ödegaard	08caf4bbde	feat(tslint): more tslint work	2016-01-13 21:22:39 +01:00
Torkel Ödegaard	59c928acc2	feat(tslint): added more tslint rules	2016-01-13 21:07:57 +01:00
David Keijser	1896bd0920	Add missing peer dependency: phantomjs	2016-01-08 16:27:43 +01:00
Torkel Ödegaard	4522b02925	tech(systemjs): almost all tests are passing	2015-12-21 16:00:58 +01:00
Torkel Ödegaard	f7888886e9	tech(systemjs): working on getting tests to work	2015-12-21 11:10:16 +01:00
Torkel Ödegaard	93e424de4c	tech(systemjs): work on systemjs builder	2015-12-18 15:59:27 +01:00
Torkel Ödegaard	545c39356a	tech(systemjs): starting work on systemjs bundling	2015-12-17 19:18:30 +01:00
Torkel Ödegaard	ca84ef38f8	angular2 test	2015-12-16 12:21:13 +01:00
Torkel Ödegaard	7ee290cc57	tech(systemjs): systemjs and jspm work	2015-12-15 17:56:16 +01:00
Torkel Ödegaard	55448de92a	updated master version to 3.0.0-pre1	2015-12-14 17:10:30 +01:00
Torkel Ödegaard	fcd3af30ec	updated version to 2.6.0	2015-12-14 15:18:01 +01:00
Torkel Ödegaard	cdc36dd171	Updated version	2015-12-08 15:41:34 +01:00
Torkel Ödegaard	df366da721	updated version to 2.6.0-beta1	2015-12-04 10:39:50 +01:00
Torkel Ödegaard	8eb3e48bc7	fix(build): fixed build issues with concat not including require_config	2015-12-02 18:22:47 +01:00
Torkel Ödegaard	d315ff2b96	changelog: updated master version to 2.6 and merged develop branch	2015-11-12 13:47:12 +01:00
Torkel Ödegaard	4729bea1a2	fix(dashboard): fix for collapse row by clicking on row title, fixes #3065	2015-10-28 15:04:58 +01:00
Torkel Ödegaard	6397b8c1ef	docs(): updated version to 2.5.0	2015-10-28 09:31:57 +01:00
Torkel Ödegaard	22a4ef42fc	version change to 2.5-pre2	2015-10-27 12:22:30 +01:00
Torkel Ödegaard	d705108be5	feat(timepicker2): added date math tests	2015-09-16 18:48:41 +02:00
Torkel Ödegaard	1900c81d9f	tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build	2015-09-13 12:13:47 +02:00
Torkel Ödegaard	dceec44671	removed tsconfig	2015-09-10 14:36:05 +02:00
Torkel Ödegaard	da832368f0	dev building and optimized builds work	2015-09-10 12:42:24 +02:00
Torkel Ödegaard	abac8bccc6	tech(typescript): its looking good	2015-09-10 11:26:40 +02:00
Torkel Ödegaard	3c40310e9b	tech(typescript): testing for how to migrate to typescript	2015-09-09 09:57:06 +02:00
Torkel Ödegaard	171ed497f9	version bumped to 2.5	2015-09-08 09:20:46 +02:00
Mat Schaffer	be3f657073	Use SPDB license id ... This avoids an npm warning telling you to use such an id.	2015-08-27 07:35:59 +09:00
Torkel Ödegaard	90169d6a05	Bumped master version to 2.2.0-pre1	2015-08-11 11:18:39 +02:00
Torkel Ödegaard	be7a3a0940	pumped version to 2.1.1	2015-08-11 10:48:19 +02:00
Torkel Ödegaard	956a2bbdbe	Updated version	2015-08-05 16:06:55 +02:00