[zanata/zanata-server] 2d357d: WIP: refactor merge account page

[GitHub]

  Branch: refs/heads/merge-account-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 2d357d512627c51eb86c2842ab136afc93a184ea
      https://github.com/zanata/zanata-server/commit/2d357d512627c51eb86c2842ab136afc93a184ea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    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/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

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

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
	zanata-war/src/main/webapp/project/home.xhtml
	zanata-war/src/main/webapp/version-group/home.xhtml


  Commit: 13d20a49f6f36e790325065e5c5bf1e943910b84
      https://github.com/zanata/zanata-server/commit/13d20a49f6f36e790325065e5c5bf1e943910b84
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 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: 7e6a1cfe6a59aa551c43c44dfe6e4edc7893d608
      https://github.com/zanata/zanata-server/commit/7e6a1cfe6a59aa551c43c44dfe6e4edc7893d608
  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
    M zanata-war/src/main/resources/messages.properties
    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/resources/script/components-script.js

  Log Message:
  -----------
  Refactor account merge page and remove unused image


Compare: https://github.com/zanata/zanata-server/compare/2d357d512627^...7e6a1cfe6a59