[zanata/zanata-server] 28715a: rhbz1147364 - fix concurrent popup

Tue Oct 7 23:32:07 UTC 2014

  Branch: refs/heads/zanata-spa
  Home:   https://github.com/zanata/zanata-server
  Commit: 28715a96680fa68e71f1f80a7cdaac19b4125131
      https://github.com/zanata/zanata-server/commit/28715a96680fa68e71f1f80a7cdaac19b4125131
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java

  Log Message:
  -----------
  rhbz1147364 - fix concurrent popup

  Commit: e5afd970feacacf3fc7137568dca235cfc4b0d20
      https://github.com/zanata/zanata-server/commit/e5afd970feacacf3fc7137568dca235cfc4b0d20
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java

  Log Message:
  -----------
  Merge pull request #592 from zanata/rhbz1147364-concurrent

rhbz1147364 - fix concurrent popup

  Commit: 678eb907eb7cf5f1efdee8d5a4e8ed8d3f2c8626
      https://github.com/zanata/zanata-server/commit/678eb907eb7cf5f1efdee8d5a4e8ed8d3f2c8626
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    A zanata-war/etc/scripts/enableLanguage.groovy
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy

  Log Message:
  -----------
  with hu, br, pt-BR, it, cs enabled

  Commit: a85e7f8172aea1ea649d70f3499ae481d8ab310e
      https://github.com/zanata/zanata-server/commit/a85e7f8172aea1ea649d70f3499ae481d8ab310e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Fix issue in adding review comments: https://bugzilla.redhat.com/show_bug.cgi?id=1148214

  Commit: 7cad1212a0ae5c299cc4361e7b4796472b3a84c5
      https://github.com/zanata/zanata-server/commit/7cad1212a0ae5c299cc4361e7b4796472b3a84c5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java

  Log Message:
  -----------
  rhbz1148248 - make chat content visible

  Commit: bea99fd69a8b453320d44cba7f8dbe493e26615d
      https://github.com/zanata/zanata-server/commit/bea99fd69a8b453320d44cba7f8dbe493e26615d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz1148259 - make history popup not autohide

  Commit: 2ca49f50ff44651f80d7ef5a70fbb014d2fb9293
      https://github.com/zanata/zanata-server/commit/2ca49f50ff44651f80d7ef5a70fbb014d2fb9293
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  Merge pull request #597 from zanata/rhbz1148259

rhbz1148259 - make history popup not autohide

  Commit: 8d07ea227b4d7ab45a4ecb8245192c53a54b15b7
      https://github.com/zanata/zanata-server/commit/8d07ea227b4d7ab45a4ecb8245192c53a54b15b7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java

  Log Message:
  -----------
  Merge pull request #596 from zanata/rhbz1148248

rhbz1148248 - make chat content visible

  Commit: 52d2452022a4bf5f6986cc9ae867b63ba9554773
      https://github.com/zanata/zanata-server/commit/52d2452022a4bf5f6986cc9ae867b63ba9554773
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java

  Log Message:
  -----------
  rhbz1148242 - Clear document/locale stats after a copy

Pull Request: https://github.com/zanata/zanata-server/pull/598

Squashed commit of the following:

commit 3e054b4a903b7967da33a074c0a645b6f7ef699a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 2 09:07:37 2014 +1000

    rhbz1148242 - Clear document/locale stats after a copy trans.

    When the stats are reloaded, up-to-date stats will be re-calculated.

  Commit: e9aa37c3cd9b363daf199321560ae37a79fdb9ac
      https://github.com/zanata/zanata-server/commit/e9aa37c3cd9b363daf199321560ae37a79fdb9ac
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java

  Log Message:
  -----------
  Clear document-locale translations stats after a document has been pushed.

This allows Zanata to re-calculate those stats if the document has changed its size or translation state.

  Commit: f91365d7a1497ca6838e0334dafe546e2a75aa8b
      https://github.com/zanata/zanata-server/commit/f91365d7a1497ca6838e0334dafe546e2a75aa8b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz1148641 - disable comment when history popup is due to concurrent conflict

  Commit: 0fa6d8509ff801dadf9539df3a3023997ac55aad
      https://github.com/zanata/zanata-server/commit/0fa6d8509ff801dadf9539df3a3023997ac55aad
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java

  Log Message:
  -----------
  Merge pull request #600 from zanata/stats_after_push

Clear document-locale translations stats after a document has been pushed

  Commit: bc173d099f0900eb1d94f500b7a35a7a01b86559
      https://github.com/zanata/zanata-server/commit/bc173d099f0900eb1d94f500b7a35a7a01b86559
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  Merge pull request #601 from zanata/rhbz1148641

rhbz1148641 - disable comment when history popup is due to concurrent conflict

  Commit: a022d739a4f9e5b7e50d39586da85c4e23038080
      https://github.com/zanata/zanata-server/commit/a022d739a4f9e5b7e50d39586da85c4e23038080
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  fix issue after selecting different locale on UI

  Commit: 3f89256bee0afc3ec38915678d1f472afc7394eb
      https://github.com/zanata/zanata-server/commit/3f89256bee0afc3ec38915678d1f472afc7394eb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Fix the display name in the maintainer select box

  Commit: 6b84979ab6a256887bc744662a05737d477d77a9
      https://github.com/zanata/zanata-server/commit/6b84979ab6a256887bc744662a05737d477d77a9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #602 from zanata/fix-group-maintainer-select

Fix the display name in the maintainer select box

  Commit: 5ef3fe8c59f32c84fe76771c16877f2a726b404a
      https://github.com/zanata/zanata-server/commit/5ef3fe8c59f32c84fe76771c16877f2a726b404a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/glossary/view.xhtml

  Log Message:
  -----------
  Fix glossary upload dialog box: https://bugzilla.redhat.com/show_bug.cgi?id=1149033

  Commit: f57a4990f6d7eb59f45a6927e0a9b10c8bff2324
      https://github.com/zanata/zanata-server/commit/f57a4990f6d7eb59f45a6927e0a9b10c8bff2324
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy

  Log Message:
  -----------
  Merge pull request #593 from zanata/localized-zanata

script to enable locale in zanata

  Commit: c39c1141fc60344c4b9fbe2cb06c71a8cbe10e90
      https://github.com/zanata/zanata-server/commit/c39c1141fc60344c4b9fbe2cb06c71a8cbe10e90
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use latest version of zanata-common.

  Commit: 4e5619ab54e1aba1cc0195aba9daea40172abea5
      https://github.com/zanata/zanata-server/commit/4e5619ab54e1aba1cc0195aba9daea40172abea5
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use released version of zanata-parent.

  Commit: 0f3b10880b7bb6e0d3fd1821fef443d0350e8eec
      https://github.com/zanata/zanata-server/commit/0f3b10880b7bb6e0d3fd1821fef443d0350e8eec
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.5.0

  Commit: 81989e9b30f6c84ff50af3722d1fe90d71a31885
      https://github.com/zanata/zanata-server/commit/81989e9b30f6c84ff50af3722d1fe90d71a31885
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: d7d6d229ff2e85e6eb900895fa34cbb2b5b79fcc
      https://github.com/zanata/zanata-server/commit/d7d6d229ff2e85e6eb900895fa34cbb2b5b79fcc
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Prepare for next development iteration.

Update versions to 3.6.0-SNAPSHOT.

  Commit: 2b38cddd17c5accd5d9b6b3afbfb7e204a81e142
      https://github.com/zanata/zanata-server/commit/2b38cddd17c5accd5d9b6b3afbfb7e204a81e142
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

Merged using -s ours to prevent future merges from release overwriting the
versions in pom.xml.

  Commit: 246bdd3c465ca74c1647b2df11a4beefb4009985
      https://github.com/zanata/zanata-server/commit/246bdd3c465ca74c1647b2df11a4beefb4009985
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  Use latest available translations for the website, turn on fr.

Get the latest available translations, and activate French for the UI
since it is now over 90% translated.

  Commit: d7a5f139cf5e5ceb36f73e4951b36a25509a056d
      https://github.com/zanata/zanata-server/commit/d7a5f139cf5e5ceb36f73e4951b36a25509a056d
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

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

  Commit: 0586c86caac8f36a703a7da64efe13f0b904b72b
      https://github.com/zanata/zanata-server/commit/0586c86caac8f36a703a7da64efe13f0b904b72b
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties

  Log Message:
  -----------
  Remove trailing spaces in translations.

Trailing spaces cause a checkstyle failure, so they must be removed.

  Commit: c38332cdfa038e4e5bf96cf4c6594577255e9bff
      https://github.com/zanata/zanata-server/commit/c38332cdfa038e4e5bf96cf4c6594577255e9bff
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties

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

  Commit: cecda048f0972be79b98da26145c52c924302264
      https://github.com/zanata/zanata-server/commit/cecda048f0972be79b98da26145c52c924302264
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into zanata-spa

Conflicts:
	pom.xml

Compare: https://github.com/zanata/zanata-server/compare/b9d1c21d4f07...cecda048f097