Merge branch 'master' of https://github.com/dakshika/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/91db27f9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/91db27f9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/91db27f9 Branch: refs/heads/master Commit: 91db27f90b1e414f9eb4baad77ceafc622c3238c Parents: 48af1a1 e3ceec7 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Nov 11 16:59:02 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Nov 11 16:59:02 2014 +0530 ---------------------------------------------------------------------- .../forms/default/users/tenants.json | 10 +- .../controllers/forms/default/users/users.json | 12 +- .../controllers/forms/form_generator.jag | 134 ------------------- .../controllers/forms/schema/users/tenants.json | 42 +++--- .../console/controllers/menu/menu.json | 2 +- .../console/themes/theme0/css/custom.css | 2 +- .../themes/theme0/images/avatar/6497326.png | Bin 142145 -> 0 bytes .../themes/theme0/images/avatar/user.png | Bin 0 -> 4068 bytes .../console/themes/theme0/images/favicon.png | Bin 0 -> 2145 bytes .../theme0/partials/applications_form.hbs | 2 - .../themes/theme0/partials/configure_form.hbs | 2 - .../themes/theme0/partials/index_header.hbs | 2 +- .../themes/theme0/partials/metro_menu.hbs | 2 +- .../themes/theme0/partials/my_cartridges.hbs | 1 - .../themes/theme0/partials/users_form.hbs | 18 +-- .../console/themes/theme0/partials/wizard.hbs | 2 - .../themes/theme0/renderers/applications.js | 1 - .../theme0/renderers/applications_form.js | 5 +- .../themes/theme0/renderers/configure.js | 1 - .../themes/theme0/renderers/configure_form.js | 1 - .../themes/theme0/renderers/my_cartridges.js | 1 - .../theme0/renderers/my_cartridges_info.js | 1 - .../console/themes/theme0/renderers/users.js | 1 - .../themes/theme0/renderers/users_form.js | 1 - .../console/users_form.jag | 38 +++--- 25 files changed, 71 insertions(+), 210 deletions(-) ----------------------------------------------------------------------
