Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3e282920 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3e282920 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3e282920 Branch: refs/heads/master Commit: 3e282920791c3c54a1ee8dfe0ad1c5626b3a9ef7 Parents: e0b6e47 8b7ca5c Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Jan 19 23:20:52 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Jan 19 23:20:52 2014 +0530 ---------------------------------------------------------------------- .../console/asset.jag | 5 ++ .../console/config/acl.json | 4 +- .../console/controllers/addTenantSubmit.jag | 9 --- .../console/controllers/newTenantSubmit.jag | 28 ++++++++ .../console/index.jag | 2 + .../console/permission-mapping.txt | 19 ++++++ .../console/tenant_management.jag | 7 +- .../console/themes/theme1/pages/plain.hbs | 67 ++++++++++++++++++++ .../console/themes/theme1/partials/404.hbs | 31 +++++++++ .../console/themes/theme1/partials/header.hbs | 7 +- .../themes/theme1/partials/mycartridges.hbs | 2 +- .../theme1/partials/policy_deployments.hbs | 15 ++++- .../theme1/partials/subscribe_cartridge.hbs | 4 +- .../themes/theme1/partials/tenant_new.hbs | 24 +++---- .../console/themes/theme1/renderers/asset.js | 38 +++++++++++ .../console/themes/theme1/renderers/index.js | 6 +- .../theme1/renderers/subscribe_cartridge.js | 4 +- .../console/util/utility.jag | 8 +++ 18 files changed, 241 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
