[zanata/zanata] 0e91fa: rhbz844821 - Add error conditions when merging the...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 0e91fa45b7d77795e9aa3869f430feb7087b9b18
      https://github.com/zanata/zanata/commit/0e91fa45b7d77795e9aa3869f430feb7087b9b18
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M zanata-war/src/etc/zanata.properties
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    R zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    A zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.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/profile/view.xhtml
    M zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  rhbz844821 - Add error conditions when merging the same account.


  Commit: 35281090b19576893a2f0ec7c287e5421f3807af
      https://github.com/zanata/zanata/commit/35281090b19576893a2f0ec7c287e5421f3807af
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/etc/zanata.properties
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/PasswordGenerator.java
    A zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  rhbz844821 - Enable internal and Open Id authentication simulataneously.


  Commit: fc50a8ef075eaa64c2315ae4ba391dc544ff6edc
      https://github.com/zanata/zanata/commit/fc50a8ef075eaa64c2315ae4ba391dc544ff6edc
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasTMEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RemoteLoggingAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


Compare: https://github.com/zanata/zanata/compare/7fe7984fd2b9...fc50a8ef075e