You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/14 01:02:54 UTC
[42/47] incubator-kylin git commit: Merge branch 'staging' of
https://github.com/KylinOLAP/Kylin into staging
Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/59a1d665
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/59a1d665
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/59a1d665
Branch: refs/heads/master
Commit: 59a1d6658301cdd6d4cbcd52daafdb1480389d3a
Parents: 76e5fd3 5f9e2c9
Author: lukehan <lu...@apache.org>
Authored: Tue Mar 10 09:47:08 2015 -0700
Committer: lukehan <lu...@apache.org>
Committed: Tue Mar 10 09:47:08 2015 -0700
----------------------------------------------------------------------
.../kylin/job/execution/AbstractExecutable.java | 10 +-
server/src/main/resources/kylinSecurity.xml | 2 +-
webapp/app/js/controllers/auth.js | 2 -
webapp/app/js/controllers/cube.js | 2 +-
webapp/app/js/controllers/cubeAdvanceSetting.js | 1 +
webapp/app/js/controllers/cubeDimensions.js | 1 -
webapp/app/js/controllers/cubeModel.js | 21 +--
webapp/app/js/filters/filter.js | 1 +
webapp/app/js/listeners.js | 7 -
webapp/app/less/component.less | 17 +--
.../cubeDesigner/advanced_settings.html | 141 ++++++++++---------
.../app/partials/cubeDesigner/data_model.html | 12 +-
.../app/partials/cubeDesigner/dimensions.html | 2 +-
webapp/app/partials/cubes/cube_schema.html | 2 +-
14 files changed, 115 insertions(+), 106 deletions(-)
----------------------------------------------------------------------