carl bergquist fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints ...

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494

2015-12-11 15:16:57 +01:00

..

controllers

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

2015-12-11 15:16:57 +01:00

directives

Merge pull request #3436 from utkarshcmu/templating

2015-12-07 11:45:32 +01:00

filters

refactor: improving structure, moving things into a core module

2015-09-15 08:17:40 +02:00

routes

Merge branch 'master' of github.com:grafana/grafana

2015-12-02 21:33:06 -06:00

services

fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241

2015-11-23 14:19:10 +01:00

utils

fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465

2015-12-10 13:01:41 +01:00

config.js

refactoring: moving components -> core

2015-10-30 14:24:04 +01:00

core_module.ts

refactor: moving routes into core, improved bundle loader

2015-09-15 08:53:06 +02:00

core.ts

refactoring: moving and renaming things

2015-10-30 15:58:20 +01:00

jquery_extended.js

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00

lodash_extended.js

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00

partials.js

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00

settings.js

Fixed some broken HTML.

2015-11-24 07:29:52 +01:00

store.js

Fixed some broken HTML.

2015-11-24 07:29:52 +01:00

table_model.ts

feat(influxdb): support for table queries, closes #3409, #3219

2015-12-03 15:09:39 +01:00

time_series.ts

Added an option to hide zero values

2015-11-25 04:38:54 -08:00