Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/f8d68aef Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/f8d68aef Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/f8d68aef Branch: refs/heads/griffin-0.1.6-incubating-rc0 Commit: f8d68aef6b10d046bc099b506528f97f0b850836 Parents: c16cbc2 5464ba5 Author: William Guo <guo...@icloud.com> Authored: Mon Aug 28 17:44:15 2017 +0800 Committer: William Guo <guo...@icloud.com> Committed: Mon Aug 28 17:44:15 2017 +0800 ---------------------------------------------------------------------- ui/index.html | 2 +- ui/js/controllers/createrule-ac-ctrl.js | 9 ++++--- ui/js/controllers/mydashboard-ctrl.js | 38 ++++++++++++++-------------- ui/js/controllers/sidebar-ctrl.js | 2 +- ui/js/routes.js | 6 +++-- ui/js/services/bark-chart.js | 5 +++- 6 files changed, 34 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
