Torkel Ödegaard f2c518ba24 Merge branch 'elastic_ds' ... Conflicts: public/app/plugins/datasource/influxdb/queryCtrl.js		2015-09-08 09:17:34 +02:00
..
app	Merge branch 'elastic_ds'	2015-09-08 09:17:34 +02:00
css/less	feat(elasticsearch): small refactoring and polish	2015-09-07 09:36:56 +02:00
dashboards	Removed invalid scripted dashboard example, Closes #2063	2015-05-28 11:41:32 +02:00
emails	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 13:45:16 +02:00
fonts	Renamed src directory to public	2015-03-29 12:57:28 +02:00
img	feat(invite): began work on invited signup view, also added backdrop to login view, #2353	2015-07-19 12:34:03 +02:00
test	Merge branch 'elastic_ds'	2015-09-08 09:17:34 +02:00
vendor	Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch	2015-08-31 15:45:49 +02:00
views	feat(tagmanager): added Name variable to datalayer	2015-08-26 15:07:39 +02:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00