Torkel Ödegaard b0fe69822a Merge branch 'master' into alerting ...

Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html

2016-07-18 18:22:35 +02:00

..

bootstrap

ux(): new dashboard tabs view

2016-02-23 13:20:59 +01:00

confirm_modal.html

Merge branch 'master' into alerting

2016-07-18 18:22:35 +02:00

dashboard.html

ux(): minor tweaks

2016-02-20 11:05:06 +01:00

edit_json.html

ux(templating): tight-form -> gf-form

2016-02-24 11:56:45 +01:00

error.html

Renamed src directory to public

2015-03-29 12:57:28 +02:00

help_modal.html

feat(export): began working on export modal

2016-05-17 10:29:57 +02:00

inspector.html

ux(): updated inspector modal

2016-03-02 21:31:49 +01:00

login.html

fix(login): fixes broken validation for login

2016-06-25 17:34:47 +02:00

metrics.html

feat(): query editors, started work on updated ES query editor

2016-04-17 17:17:30 -04:00

modal.html

Renamed src directory to public

2015-03-29 12:57:28 +02:00

panelgeneral.html

ux(graph): widen input in general tab

2016-02-26 11:36:23 +01:00

reset_password.html

ux(reset_password): tight-form -> gf-form

2016-02-23 16:14:29 +01:00

roweditor.html

ux(row_editor): tight-form -> gf-form

2016-02-24 13:49:42 +01:00

signup_invited.html

ux(): completed gf-size class rename

2016-02-20 14:48:10 +01:00

signup_step2.html

feat(footer): began work on page footer

2016-05-03 09:00:58 +02:00

unsaved-changes.html

feat(plugins): progress on plugin details page, # 4275

2016-03-07 14:31:17 +01:00

valueSelectDropdown.html

ux(submenu): tight-form -> gf-form

2016-02-24 08:32:09 +01:00