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/beea4951 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/beea4951 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/beea4951 Branch: refs/heads/master Commit: beea4951eef5bb915670968a05359f6cbc3c64c3 Parents: 568ce20 9960fae Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jan 17 20:57:29 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jan 17 20:57:29 2014 +0530 ---------------------------------------------------------------------- .../controllers/cartridgeSubscribeSubmit.jag | 32 ++++ .../console/subscribe_cartridge.jag | 12 +- .../themes/theme1/partials/cartridges.hbs | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 165 ++++++++++--------- .../themes/theme1/renderers/cartridges.js | 2 - .../theme1/renderers/subscribe_cartridge.js | 5 +- .../console/util/utility.jag | 20 ++- .../manager/CartridgeSubscriptionManager.java | 15 +- 8 files changed, 159 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
