Merge branch 'feature/WAVE-420-make-login-page-customisable' into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/af39291f Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/af39291f Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/af39291f Branch: refs/heads/dev Commit: af39291ffb8d68857ee1c15e30bc67cd2d7db5b2 Parents: d886dad 775a88f Author: Yuri Zelikov <[email protected]> Authored: Sat Aug 30 11:37:20 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Sat Aug 30 11:37:20 2014 +0300 ---------------------------------------------------------------------- .../box/server/gxp/AuthenticationPage.gxp | 55 +++------------- .../box/server/rpc/AuthenticationServlet.java | 3 - war/static/loadHtmlFragment.js | 41 ++++++++++++ war/static/welcome-fragment.html | 66 ++++++++++++++++++++ 4 files changed, 117 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
