Torkel Ödegaard
|
f8f302faad
|
Merge branch 'panel_repeat' of github.com:grafana/grafana into panel_repeat
Conflicts:
public/app/partials/submenu.html
public/css/less/submenu.less
src/app/partials/roweditor.html
|
2015-04-27 14:01:55 +02:00 |
|
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 |
|
Torkel Ödegaard
|
dc03ca8879
|
Opening search closes fullscreen edit or fullscreen view
|
2015-03-30 12:25:17 +02:00 |
|
Torkel Ödegaard
|
fde11be279
|
Renamed src directory to public
|
2015-03-29 12:57:28 +02:00 |
|