[zanata/zanata] 2043e4: Merge branch 'master' of github.com:zanata/zanata

GitHub noreply at github.com
Mon Feb 27 00:32:41 UTC 2012


  Branch: refs/heads/rhbz759337
  Home:   https://github.com/zanata/zanata
  Commit: 2043e4fde882e33ad5651e1e63aed98196fa8fbe
      https://github.com/zanata/zanata/commit/2043e4fde882e33ad5651e1e63aed98196fa8fbe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/ApplicationGecko18.gwt.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/ApplicationSafari.gwt.xml

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


  Commit: 91064f23d3e5c39defd0da0703ca3f5d620746ea
      https://github.com/zanata/zanata/commit/91064f23d3e5c39defd0da0703ca3f5d620746ea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Fix bug:https://bugzilla.redhat.com/show_bug.cgi?id=795615


  Commit: 18801bd24f5db26bf9c6138e22764185f8a03698
      https://github.com/zanata/zanata/commit/18801bd24f5db26bf9c6138e22764185f8a03698
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilter.java
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilterFactory.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Log Message:
  -----------
  rhbz785034 Implement time-based cache for TextFlowFilter DocIdSets


  Commit: 05f3e41d2ec0ed9b8680e7334aa5512c9365abbf
      https://github.com/zanata/zanata/commit/05f3e41d2ec0ed9b8680e7334aa5512c9365abbf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  rhbz785034 Make client wait for TM results before submitting another request


  Commit: c33736a08747e42c5066cbaed3cad8ba8ed287fe
      https://github.com/zanata/zanata/commit/c33736a08747e42c5066cbaed3cad8ba8ed287fe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

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


  Commit: 5950bf81ca980f956873bfd5c4fa2ffd6f01d4c3
      https://github.com/zanata/zanata/commit/5950bf81ca980f956873bfd5c4fa2ffd6f01d4c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml

  Log Message:
  -----------
  Change database.defaultSchemaName to zanata in liquibase changeset


  Commit: c4639bba605473b2a77dceafd76d7317547bdbe9
      https://github.com/zanata/zanata/commit/c4639bba605473b2a77dceafd76d7317547bdbe9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml

  Log Message:
  -----------
  Use MySQL SCHEMA() function in liquibase changeset


  Commit: 49c6d7cdf5161dd582e5e57c9dd080b395f45708
      https://github.com/zanata/zanata/commit/49c6d7cdf5161dd582e5e57c9dd080b395f45708
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml

  Log Message:
  -----------
  Ensure preconditions for char(32) changeset are checked again


  Commit: 7e6754527c50a5ee78896b101bf429f656d5f2ec
      https://github.com/zanata/zanata/commit/7e6754527c50a5ee78896b101bf429f656d5f2ec
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
  M server/zanata-war/src/main/webapp/admin/home.xhtml
  A server/zanata-war/src/main/webapp/admin/stats.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css

  Log Message:
  -----------
  Reorganise admin home page with more stats


  Commit: 460db652b9c2a0b43d8fc6388505d7a6f62052be
      https://github.com/zanata/zanata/commit/460db652b9c2a0b43d8fc6388505d7a6f62052be
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
  M server/zanata-war/src/main/webapp/admin/home.xhtml
  A server/zanata-war/src/main/webapp/admin/stats.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css

  Log Message:
  -----------
  Merge branch 'rhbz759337'


  Commit: 1331838374a897a9a16411804b56294d9a65ebd7
      https://github.com/zanata/zanata/commit/1331838374a897a9a16411804b56294d9a65ebd7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java

  Log Message:
  -----------
  Fix editor focus issue: https://bugzilla.redhat.com/show_bug.cgi?id=773175#c5


  Commit: 73ef720ef35ac4efa4e2fb57b19287bc9f2ab3e3
      https://github.com/zanata/zanata/commit/73ef720ef35ac4efa4e2fb57b19287bc9f2ab3e3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java

  Log Message:
  -----------
  Found bug on previous implementation, temporary workaround


  Commit: 1201f62721e36357d07a4ec5922731d90a5085c0
      https://github.com/zanata/zanata/commit/1201f62721e36357d07a4ec5922731d90a5085c0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release zanata-1.5.0-alpha-2


  Commit: b13b14f056ace9e20beba70271ba794359e9c4ae
      https://github.com/zanata/zanata/commit/b13b14f056ace9e20beba70271ba794359e9c4ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

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


  Commit: d5c563da9be08788ffc951d51490b8db9324ef76
      https://github.com/zanata/zanata/commit/d5c563da9be08788ffc951d51490b8db9324ef76
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java

  Log Message:
  -----------
  Add test listener to clear hibernate cache between test executions.

This prevents DBUnit based tests to fail when the hibernate cached is not synchronized with DBUnit's data changes.


  Commit: 3b1defe3e08a57ddb3bbd0e3eb032b401f653f14
      https://github.com/zanata/zanata/commit/3b1defe3e08a57ddb3bbd0e3eb032b401f653f14
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilter.java
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilterFactory.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/ApplicationGecko18.gwt.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/ApplicationSafari.gwt.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
  M server/zanata-war/src/main/webapp/admin/home.xhtml
  A server/zanata-war/src/main/webapp/admin/stats.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
  M zanata-parent/pom.xml

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


  Commit: 5260221af67826a5848111dadafd1ebdc86aa01e
      https://github.com/zanata/zanata/commit/5260221af67826a5848111dadafd1ebdc86aa01e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilter.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java

  Log Message:
  -----------
  Enable more query caching


  Commit: c520af6b0c3d35bc2cf4594e9e1cab987218b093
      https://github.com/zanata/zanata/commit/c520af6b0c3d35bc2cf4594e9e1cab987218b093
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
  M zanata-parent/pom.xml

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


  Commit: b630a6bd73d39fb4e160b2d01a24d1930d61a078
      https://github.com/zanata/zanata/commit/b630a6bd73d39fb4e160b2d01a24d1930d61a078
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java

  Log Message:
  -----------
  Fix issues found in https://bugzilla.redhat.com/show_bug.cgi?id=773175#c5 and https://bugzilla.redhat.com/show_bug.cgi?id=773175#c6


  Commit: 20fbedb5d53122aabe3d16158c870ecae909a91b
      https://github.com/zanata/zanata/commit/20fbedb5d53122aabe3d16158c870ecae909a91b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java

  Log Message:
  -----------
  Merge branch 'rhbz773175'

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java


  Commit: 204fce32a501a65caf31f650d6733b3b09fe2cfc
      https://github.com/zanata/zanata/commit/204fce32a501a65caf31f650d6733b3b09fe2cfc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  Disable mvn deployment of zanata war files


  Commit: 818e386e867e36e8c4f5ba7ca1f1c8568217c9ec
      https://github.com/zanata/zanata/commit/818e386e867e36e8c4f5ba7ca1f1c8568217c9ec
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java

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


  Commit: d56fc163e361ba2d67f3f823c3dfdda2c92de0f0
      https://github.com/zanata/zanata/commit/d56fc163e361ba2d67f3f823c3dfdda2c92de0f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    R server/zanata-model/src/main/java/org/zanata/hibernate/search/GlossaryFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilterFactory.java
  R server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilter.java
  R server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Log Message:
  -----------
  Revert to id-based Filter, but with DocIdSet caching enabled


  Commit: deecd1447a454883e25948a1279f58c341be0206
      https://github.com/zanata/zanata/commit/deecd1447a454883e25948a1279f58c341be0206
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java

  Log Message:
  -----------
  Disable caching of locale team membership


  Commit: 2de0498e8d6a1802e1e6434d357ee23c7ac5bd92
      https://github.com/zanata/zanata/commit/2de0498e8d6a1802e1e6434d357ee23c7ac5bd92
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java

  Log Message:
  -----------
  Fix problem with https://bugzilla.redhat.com/show_bug.cgi?id=759337#c4


Compare: https://github.com/zanata/zanata/compare/6fcd76e...2de0498


More information about the zanata-commits mailing list