[zanata/zanata-server] 47bc12: Redesign account merge page: https://bugzilla.redh...

[GitHub]

  Branch: refs/heads/rhbz1110048
  Home:   https://github.com/zanata/zanata-server
  Commit: 47bc12a889d0f48865bb4d7574298e0c87f5d74f
      https://github.com/zanata/zanata-server/commit/47bc12a889d0f48865bb4d7574298e0c87f5d74f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Redesign account merge page: https://bugzilla.redhat.com/show_bug.cgi?id=1110048