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
..
app	Merge branch 'master' into panel_repeat	2015-04-27 13:53:02 +02:00
css/less	Merge branch 'master' into panel_repeat	2015-04-27 13:53:02 +02:00
dashboards	Renamed src directory to public	2015-03-29 12:57:28 +02:00
fonts	Renamed src directory to public	2015-03-29 12:57:28 +02:00
img	Renamed src directory to public	2015-03-29 12:57:28 +02:00
test	Merge branch 'master' into panel_repeat	2015-04-27 13:53:02 +02:00
vendor	Began work on dashboard: editable flag, that actually stops users from changing anything, #1834	2015-04-23 15:26:48 +02:00
views	Unsaved changes: Do not show for users with role , Fixes #1703	2015-04-02 08:08:22 +02:00