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

GitHub noreply at github.com
Tue Sep 11 04:44:49 UTC 2012 

  Branch: refs/heads/workspaceDesign
  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


  Commit: 17ec9492f87775287e71452aac8cf79a3b66aaff
      https://github.com/zanata/zanata/commit/17ec9492f87775287e71452aac8cf79a3b66aaff
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  rhbz812730 - allow TM merge fuzzy text flow and bug fixing


  Commit: 923973c2c6da63829a928439045bbadf1acb0437
      https://github.com/zanata/zanata/commit/923973c2c6da63829a928439045bbadf1acb0437
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java


  Commit: ddda775346688ac47eb639368910234f16c526f3
      https://github.com/zanata/zanata/commit/ddda775346688ac47eb639368910234f16c526f3
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    R zanata-war/src/main/java/org/zanata/action/MaintainerProjectList.java
    R zanata-war/src/main/java/org/zanata/action/MemberLanguageList.java

  Log Message:
  -----------
  Remove unused bean


  Commit: 1fb5a37f7e809c9d6374052b0ce80c62fc724908
      https://github.com/zanata/zanata/commit/1fb5a37f7e809c9d6374052b0ce80c62fc724908
  Author: Alex Eng <loones1595 at gmail.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/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
    M zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.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
    A zanata-war/src/main/java/org/zanata/util/PasswordGenerator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.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/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/resources/zanata.properties

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


  Commit: 1468dfccbea5ed61ad027f40c7eb3611922ee128
      https://github.com/zanata/zanata/commit/1468dfccbea5ed61ad027f40c7eb3611922ee128
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-10 (Mon, 10 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/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    R zanata-war/src/main/java/org/zanata/action/MaintainerProjectList.java
    R zanata-war/src/main/java/org/zanata/action/MemberLanguageList.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
    M zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.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
    A zanata-war/src/main/java/org/zanata/util/PasswordGenerator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.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/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  Merge branch 'master' into workspaceDesign


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  Fix issue with copy trans GUI and issue with login not working for internal auth.


  Commit: a6f2a646c94d8eb967dce7aa01bd2102f5c0339d
      https://github.com/zanata/zanata/commit/a6f2a646c94d8eb967dce7aa01bd2102f5c0339d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-10 (Mon, 10 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/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java

  Log Message:
  -----------
  rhbz856011 - Enable admin user boostrapping from zanata.properties


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    R zanata-war/src/main/java/org/zanata/action/MaintainerProjectList.java
    R zanata-war/src/main/java/org/zanata/action/MemberLanguageList.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

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


  Commit: c8022cea186346863e261fb53ea997869e751dda
      https://github.com/zanata/zanata/commit/c8022cea186346863e261fb53ea997869e751dda
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-09-10 (Mon, 10 Sep 2012)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Use maven-replacer-plugin to get around GWT plugin warnings in Eclipse


  Commit: e41235ac57f8b0a5b3d51881cfd94cfb0f080a77
      https://github.com/zanata/zanata/commit/e41235ac57f8b0a5b3d51881cfd94cfb0f080a77
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-10 (Mon, 10 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutSelection.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.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/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Moved notification to side menu


  Commit: d7bd8435d5732196856d801776c8f974f923c254
      https://github.com/zanata/zanata/commit/d7bd8435d5732196856d801776c8f974f923c254
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-10 (Mon, 10 Sep 2012)

  Changed paths:
    M zanata-war/pom.xml
    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/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  Merge branch 'master' into workspaceDesign


  Commit: 4bf6ccd0b9fd31f85b4e8df708b1af7609a70e12
      https://github.com/zanata/zanata/commit/4bf6ccd0b9fd31f85b4e8df708b1af7609a70e12
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-10 (Mon, 10 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    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/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    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/TransUnitNavigationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Complete moving notification to side menu, fix unit test


Compare: https://github.com/zanata/zanata/compare/64eca8acdc83...4bf6ccd0b9fd

More information about the zanata-commits mailing list