You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/20 12:33:41 UTC

[7/7] stratos git commit: Merge branch 'application-json-fix' of https://github.com/dakshika/stratos

Merge branch 'application-json-fix' 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/78cd52ff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/78cd52ff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/78cd52ff

Branch: refs/heads/master
Commit: 78cd52ff665a8df6578d8045816fda39d8c458f9
Parents: 54b039c 069d4f7
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Nov 20 17:02:48 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Nov 20 17:02:48 2014 +0530

----------------------------------------------------------------------
 .../console/applications_form.jag                 |  5 ++++-
 .../console/configure_form.jag                    | 11 +++++++++++
 .../console/controllers/rest/rest_calls.jag       |  4 ++++
 .../console/errorhtml/error-404.html              | 16 ++++++++--------
 .../console/errorhtml/error.html                  | 18 +++++++++---------
 .../console/themes/theme0/css/custom.css          |  2 +-
 .../themes/theme0/partials/applications_form.hbs  | 11 +++++++++++
 .../themes/theme0/partials/configure_form.hbs     |  8 +++++++-
 .../themes/theme0/renderers/configure_form.js     |  1 +
 .../src/main/webapp/api/WEB-INF/cxf-servlet.xml   |  2 ++
 10 files changed, 58 insertions(+), 20 deletions(-)
----------------------------------------------------------------------