[zanata/zanata-server] 7d0760: refactor merge account page

[GitHub]

  Branch: refs/heads/rhbz1067288
  Home:   https://github.com/zanata/zanata-server
  Commit: 7d07603a344b92eb74d996b881dd135e910ec90f
      https://github.com/zanata/zanata-server/commit/7d07603a344b92eb74d996b881dd135e910ec90f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    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
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  refactor merge account page


  Commit: fa2896eb1c29ef72ab340e8a5465fd83353030b4
      https://github.com/zanata/zanata-server/commit/fa2896eb1c29ef72ab340e8a5465fd83353030b4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1067288


Compare: https://github.com/zanata/zanata-server/compare/eea4d60912b8...fa2896eb1c29