Torkel Ödegaard bf6f0f1a65 Merge branch 'master' into panel_repeat ...

Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html

2015-04-27 13:53:02 +02:00

..

confirm_modal.html

Renamed src directory to public

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

dashboard.html

more work on editable false, #1834

2015-04-25 11:10:28 +02:00

dasheditor.html

Began work on dashboard: editable flag, that actually stops users from changing anything, #1834

2015-04-23 15:26:48 +02:00

edit_json.html

Renamed src directory to public

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

error.html

Renamed src directory to public

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

help_modal.html

Typo fix in help_modal.html

2015-04-09 16:18:15 -04:00

inspector.html

Renamed src directory to public

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

login.html

Renamed src directory to public

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

metrics.html

Mini work on InfluxDB 0.9 datasource, still needs a lot of work

2015-03-29 20:47:34 +02:00

modal.html

Renamed src directory to public

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

panelgeneral.html

Merge branch 'master' into panel_repeat

2015-04-27 13:53:02 +02:00

playlist.html

Small UI polish to playlist creation view

2015-04-20 11:47:09 +02:00

roweditor.html

Row editor: increased width of title field, Fixes #1755

2015-04-15 10:52:09 +02:00

search.html

Merge branch 'master' into panel_repeat

2015-04-27 13:53:02 +02:00

sidemenu.html

Renamed src directory to public

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

submenu.html

Merge branch 'master' into panel_repeat

2015-04-27 13:53:02 +02:00

templating_editor.html

Merge branch 'master' into panel_repeat

2015-04-27 13:53:02 +02:00

unsaved-changes.html

Renamed src directory to public

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