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

..

directives

Renamed src directory to public

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

partials

More work on editable false dashboards, #1834

2015-04-27 10:09:32 +02:00

all.js

Merge branch 'master' into panel_repeat

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

dashboardCtrl.js

Merge branch 'master' into panel_repeat

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

dashboardNavCtrl.js

Using CTRL+S should not work when dashboardMeta.canSave is false, #1834

2015-04-27 10:59:14 +02:00

dashboardSrv.js

Merge branch 'master' into panel_repeat

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

graphiteImportCtrl.js

Fixed importing dashboards from graphite web issue

2015-04-06 14:46:06 +02:00

importCtrl.js

Renamed src directory to public

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

keybindings.js

Renamed src directory to public

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

playlistCtrl.js

Renamed src directory to public

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

playlistSrv.js

Renamed src directory to public

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

rowCtrl.js

Row editor fix: fixed issue when opening row editor when dashboard settings view is opened, Fixes #1688

2015-04-02 10:05:33 +02:00

saveDashboardAsCtrl.js

Renamed src directory to public

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

shareModalCtrl.js

Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel, Closes #1701

2015-04-02 09:21:38 +02:00

shareSnapshotCtrl.js

Unsaved changes: Do not show for snapshots, scripted and file based dashboards, Fixes #1707

2015-04-06 11:22:35 +02:00

snapshotTopNavCtrl.js

Refactoring of share modal

2015-03-29 14:30:03 +02:00

submenuCtrl.js

Merge branch 'master' into panel_repeat

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

timeSrv.js

Renamed src directory to public

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

unsavedChangesSrv.js

Small fix for unsaved changes when using save as feature

2015-04-27 10:29:04 +02:00

viewStateSrv.js

Renamed src directory to public

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