[zanata/zanata] c6bd4d: [maven-release-plugin] prepare release server-2.1....

GitHub noreply at github.com
Tue Feb 26 03:58:29 UTC 2013


  Branch: refs/heads/seam230final
  Home:   https://github.com/zanata/zanata
  Commit: c6bd4da8076adc12e608be25970cd8ab56800dce
      https://github.com/zanata/zanata/commit/c6bd4da8076adc12e608be25970cd8ab56800dce
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

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

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


  Commit: af0a61c47eb3924823664b6ca5fd9ad07c4a99ef
      https://github.com/zanata/zanata/commit/af0a61c47eb3924823664b6ca5fd9ad07c4a99ef
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

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

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


  Commit: 49986fd0d62b0a2cce580e5d0d91db98f0ed324b
      https://github.com/zanata/zanata/commit/49986fd0d62b0a2cce580e5d0d91db98f0ed324b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml

  Log Message:
  -----------
  change wording according to feedback


  Commit: 8ee674ba7f99eafd595d7b02fe44b9501ca0b87e
      https://github.com/zanata/zanata/commit/8ee674ba7f99eafd595d7b02fe44b9501ca0b87e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

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


  Commit: 5a651f86ec8442bad939814a7386ea16f5fcce22
      https://github.com/zanata/zanata/commit/5a651f86ec8442bad939814a7386ea16f5fcce22
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml

  Log Message:
  -----------
  change wording according to feedback


  Commit: d5b1a88cd105f8bd1700a7bd6c659fe50c308aaf
      https://github.com/zanata/zanata/commit/d5b1a88cd105f8bd1700a7bd6c659fe50c308aaf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java

  Log Message:
  -----------
  change default editor option


  Commit: ee92789f19659bdc02c3959d5c609d3de73ab662
      https://github.com/zanata/zanata/commit/ee92789f19659bdc02c3959d5c609d3de73ab662
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java

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


  Commit: 034e6167b185da2eab78f598191f13a13d4e3c96
      https://github.com/zanata/zanata/commit/034e6167b185da2eab78f598191f13a13d4e3c96
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java

  Log Message:
  -----------
  fix test


  Commit: f1735e6e59fb5183f39b07aed6cb9669bf1151cd
      https://github.com/zanata/zanata/commit/f1735e6e59fb5183f39b07aed6cb9669bf1151cd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java

  Log Message:
  -----------
  fix issue: after save source panel code mirror instance needs refresh


  Commit: c83fc72171b5b3add6c8f6a48d9d00d94666d382
      https://github.com/zanata/zanata/commit/c83fc72171b5b3add6c8f6a48d9d00d94666d382
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java

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


  Commit: 5552db5edb9b54b64f6f084cd6d0b01f43010a62
      https://github.com/zanata/zanata/commit/5552db5edb9b54b64f6f084cd6d0b01f43010a62
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    A zanata-war/src/main/java/org/zanata/exception/LinkExpiredException.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml

  Log Message:
  -----------
  Work in progress, expire activation link after 1 day: https://bugzilla.redhat.com/show_bug.cgi?id=893811


  Commit: fbdb176852a4caad5d0bf4152ebb6a543dd44679
      https://github.com/zanata/zanata/commit/fbdb176852a4caad5d0bf4152ebb6a543dd44679
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java

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


  Commit: 7c6e1e8803f8dca88bbea7a0c86b1c721f244c62
      https://github.com/zanata/zanata/commit/7c6e1e8803f8dca88bbea7a0c86b1c721f244c62
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Implement expiry check on registration link: https://bugzilla.redhat.com/show_bug.cgi?id=893811


  Commit: c4e6962219de749e01e70e89dbd2205a3b1f7477
      https://github.com/zanata/zanata/commit/c4e6962219de749e01e70e89dbd2205a3b1f7477
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Moved 'download all files' up, restore translate, untranslated column in document list view


  Commit: 773bd42496ff46d10ed1168864dc2feba4627f3a
      https://github.com/zanata/zanata/commit/773bd42496ff46d10ed1168864dc2feba4627f3a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java

  Log Message:
  -----------
  Change implementation of ETag generation.

Use HQL queries for generation.
Also fix small bug when calculating the last translator for a document.


  Commit: 0e736d2c8c79a475c156052f9f15955c38b8841d
      https://github.com/zanata/zanata/commit/0e736d2c8c79a475c156052f9f15955c38b8841d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java

  Log Message:
  -----------
  Switch hashable state method to use a StringBuffer instead of List<String>


  Commit: 2b97467e5f91e68696a2248452a8247ce959c968
      https://github.com/zanata/zanata/commit/2b97467e5f91e68696a2248452a8247ce959c968
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    A zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java

  Log Message:
  -----------
  Change translated document hash method implementation to use a single native SQL query.

Add tests for hash method.


  Commit: 2abb2527fed7760403fc2b115d19700fe4af059d
      https://github.com/zanata/zanata/commit/2abb2527fed7760403fc2b115d19700fe4af059d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java

  Log Message:
  -----------
  Add result Transformer to native Etag document query.

This is needed because of the discrepancies between the MD5 function in h2 and MySQL.


  Commit: c199df67738e5418091bd1224f0fa7fa83d9868a
      https://github.com/zanata/zanata/commit/c199df67738e5418091bd1224f0fa7fa83d9868a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java

  Log Message:
  -----------
  rhbz903964 - Error messages are now communicated to the client on async push.


  Commit: 22d7976121c9ab34fe5cc02fcd7081b77108a61d
      https://github.com/zanata/zanata/commit/22d7976121c9ab34fe5cc02fcd7081b77108a61d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml


  Commit: 867548e0b4762001d47facd7ce998278381523ae
      https://github.com/zanata/zanata/commit/867548e0b4762001d47facd7ce998278381523ae
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  rhbz910191 - hook into window resize event to avoid distorted code mirror editor(tiny scrollbar)


  Commit: 3df93961c7551289f47fb11e6848779ba8235343
      https://github.com/zanata/zanata/commit/3df93961c7551289f47fb11e6848779ba8235343
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  fix on project maintainer access to edit page code: https://bugzilla.redhat.com/show_bug.cgi?id=912590


  Commit: a44cb34b93adb2fb86c2f858c8688f93962a93e7
      https://github.com/zanata/zanata/commit/a44cb34b93adb2fb86c2f858c8688f93962a93e7
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml

  Log Message:
  -----------
  fix document list layout problem with small screen


  Commit: 6438ccc8d46a968acd143b0367049f3725040937
      https://github.com/zanata/zanata/commit/6438ccc8d46a968acd143b0367049f3725040937
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java

  Log Message:
  -----------
  fix 'default from email' used in zanata.properties: https://bugzilla.redhat.com/show_bug.cgi?id=913310


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java

  Log Message:
  -----------
  Entity tags might return null if the translated document does not exist.


  Commit: 6831cff0e9d5ec001c70d850b0ba303a0b03a659
      https://github.com/zanata/zanata/commit/6831cff0e9d5ec001c70d850b0ba303a0b03a659
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/webapp/admin/home.xhtml

  Log Message:
  -----------
  Allow more columns in Admin page


  Commit: 7d140f6c05dec322e5c1d29895eda2b1a7a726f0
      https://github.com/zanata/zanata/commit/7d140f6c05dec322e5c1d29895eda2b1a7a726f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/IdBitSetFilter.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/IdBitSetFilterFactory.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdFilterFactory.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TranslatedTextFlowFilter.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TranslatedTextFlowFilterFactory.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java

  Log Message:
  -----------
  Rename TranslatedTextFlowFilter->IdBitSetFilter; remove IdFilter


  Commit: 04bef54f3231ae2c3932c7b35028b12222da6391
      https://github.com/zanata/zanata/commit/04bef54f3231ae2c3932c7b35028b12222da6391
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/process/AsynchronousExecutor.java
    A zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/IndexerProcessHandle.java
    M zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java

  Log Message:
  -----------
  Extract ClassIndexer/GenericClassIndexer


  Commit: 5da53a959be089a710fabb6c71351ebab9bc647c
      https://github.com/zanata/zanata/commit/5da53a959be089a710fabb6c71351ebab9bc647c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java

  Log Message:
  -----------
  Reduce some GWT logging


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

  Changed paths:
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Support circular injection (optional) and avoid StackOverflowError


  Commit: 3070062c9b4f1281459bc31956b8baa6179005de
      https://github.com/zanata/zanata/commit/3070062c9b4f1281459bc31956b8baa6179005de
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

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

  Log Message:
  -----------
  rhbz912583 update database to change project type 'raw' to 'file'


  Commit: 5f9c1b6731e34efb5e7693b1071ac4b8a32f3680
      https://github.com/zanata/zanata/commit/5f9c1b6731e34efb5e7693b1071ac4b8a32f3680
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  rhbz912583 respond with error on put-project with invalid default project type


  Commit: b58857e8e84b648f6baf0c2281d6ce7a47c79403
      https://github.com/zanata/zanata/commit/b58857e8e84b648f6baf0c2281d6ce7a47c79403
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

  Log Message:
  -----------
  rhbz912583 change project type in project dto to string


  Commit: 50bb2bc3227b620caccb0c714a406f7994767e2b
      https://github.com/zanata/zanata/commit/50bb2bc3227b620caccb0c714a406f7994767e2b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java

  Log Message:
  -----------
  rhbz912583 generate project type hint for config file from enum


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

  Changed paths:
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdBitSetFilter.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdBitSetFilterFactory.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/search/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/resources/META-INF/ehcache.xml
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java

  Log Message:
  -----------
  Create TranslatedTextFlowFilter and integrate with TranslationStateCacheImpl to minimise DB queries


  Commit: 3d924a583e70ee82879493b876e6d3e2aae26750
      https://github.com/zanata/zanata/commit/3d924a583e70ee82879493b876e6d3e2aae26750
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/TranslatedTextFlowFilter.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java

  Log Message:
  -----------
  Extract TranslationMemoryQueryService from TextFlowDAO to remove circular dependency


  Commit: 9ac9ae871026a35b4b5228c75375508405407d01
      https://github.com/zanata/zanata/commit/9ac9ae871026a35b4b5228c75375508405407d01
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml

  Log Message:
  -----------
  Fix unexpected error when contact team coordinator: https://bugzilla.redhat.com/show_bug.cgi?id=913331


  Commit: e67022e24e4ff7313cd7f848b51dc01c5666e1ff
      https://github.com/zanata/zanata/commit/e67022e24e4ff7313cd7f848b51dc01c5666e1ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

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


  Commit: cf2c28c1008e1bb8241ffa75301658583b01f2cd
      https://github.com/zanata/zanata/commit/cf2c28c1008e1bb8241ffa75301658583b01f2cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    A zanata-war/src/main/java/org/zanata/exception/ActivationLinkExpiredException.java
    R zanata-war/src/main/java/org/zanata/exception/LinkExpiredException.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Change activation link expired messages: https://bugzilla.redhat.com/show_bug.cgi?id=893811#c2


  Commit: 8b8172800f2b6fb0759d2018c98f8e57859f7598
      https://github.com/zanata/zanata/commit/8b8172800f2b6fb0759d2018c98f8e57859f7598
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml

  Log Message:
  -----------
  Include expiry message in activation, validation email


  Commit: 3e7fa73b69641a2198536e0dd90349a944e86697
      https://github.com/zanata/zanata/commit/3e7fa73b69641a2198536e0dd90349a944e86697
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java

  Log Message:
  -----------
  Use constants for query names


  Commit: abfd586c4e4b536976d5161aacbc978d82817748
      https://github.com/zanata/zanata/commit/abfd586c4e4b536976d5161aacbc978d82817748
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  rhbz912583 relax requirement for non-null project type on put project


  Commit: 22464302e80a92298936cb2f22da98f71141e187
      https://github.com/zanata/zanata/commit/22464302e80a92298936cb2f22da98f71141e187
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  rhbz912583 avoid NullPointerException for null project types


  Commit: 0e368a9b1c620a30ac4fbbddcbb03ef1de4e1c34
      https://github.com/zanata/zanata/commit/0e368a9b1c620a30ac4fbbddcbb03ef1de4e1c34
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    A zanata-war/src/main/java/org/zanata/exception/ActivationLinkExpiredException.java
    R zanata-war/src/main/java/org/zanata/exception/LinkExpiredException.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

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


  Commit: 7ca7d9f1b14ce6461e76feacbf2405ecd54916de
      https://github.com/zanata/zanata/commit/7ca7d9f1b14ce6461e76feacbf2405ecd54916de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  Clean up TranslationWorkspaceManagerImpl and TranslationWorkspaceImpl


  Commit: 2151e61b0332f503580d87b8f1384e1d19043ba6
      https://github.com/zanata/zanata/commit/2151e61b0332f503580d87b8f1384e1d19043ba6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java

  Log Message:
  -----------
  Fix test failure


  Commit: eb37891133a08b55e133012c4c45edc478f28e07
      https://github.com/zanata/zanata/commit/eb37891133a08b55e133012c4c45edc478f28e07
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  rhbz912583 replace project type parameter with string on project version


  Commit: 754bf377987a0ce424c74527c05f2cd4f57bd1ea
      https://github.com/zanata/zanata/commit/754bf377987a0ce424c74527c05f2cd4f57bd1ea
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  remove unnecessary condition and cast


  Commit: e6d827500a6c66f1614c10dc86f68503d94a48cd
      https://github.com/zanata/zanata/commit/e6d827500a6c66f1614c10dc86f68503d94a48cd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

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

  Log Message:
  -----------
  fix: openJDK can't infer type


  Commit: 6f2482f40c13a3d47d82abaff4f210834e53c4b8
      https://github.com/zanata/zanata/commit/6f2482f40c13a3d47d82abaff4f210834e53c4b8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java

  Log Message:
  -----------
  rhbz913373 - Ctrl-Enter not moving to next trans unit if there are no changes


  Commit: 99228730e65cd923382f1abfe71945a72a4e884c
      https://github.com/zanata/zanata/commit/99228730e65cd923382f1abfe71945a72a4e884c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

  Log Message:
  -----------
  rhbz913763 - search term contains % should be escaped


  Commit: 2e9a156e34e7e9f089e47ede54a047e27ef5febe
      https://github.com/zanata/zanata/commit/2e9a156e34e7e9f089e47ede54a047e27ef5febe
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml

  Log Message:
  -----------
  avoid inadvertant setting of project type in project and version edit forms


  Commit: 9c2893239911a76a924583575a567102d96ef780
      https://github.com/zanata/zanata/commit/9c2893239911a76a924583575a567102d96ef780
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  rhbz913745 - Fix issues with Zip File download.

Server path was not being correctly derived in some cases.
Refactor a few of the clases that generate the zanata.xml file.


  Commit: 5729f2720827c8910108f547828e1c2abbd2379f
      https://github.com/zanata/zanata/commit/5729f2720827c8910108f547828e1c2abbd2379f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/integration/master' into integration/master


  Commit: 0af5d40dbef8a9683a25a2dafb450c68efb4257c
      https://github.com/zanata/zanata/commit/0af5d40dbef8a9683a25a2dafb450c68efb4257c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update H2


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

  Changed paths:
    R zanata-war/src/main/java/org/h2/tools/TriggerAdapter.java

  Log Message:
  -----------
  Remove H2 code


  Commit: ab2cc3cb9b808b5a58e9a1c674de7b0a7145ac34
      https://github.com/zanata/zanata/commit/ab2cc3cb9b808b5a58e9a1c674de7b0a7145ac34
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Display an error when open id autheorization denied on the provider.


  Commit: 80a0da73ac6906a257913e9e6401cbf7d8a15a2c
      https://github.com/zanata/zanata/commit/80a0da73ac6906a257913e9e6401cbf7d8a15a2c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java

  Log Message:
  -----------
  ensure project type hints in server-generated config file are lowercase


  Commit: 2bc9b4cc87d4cdb87e876ca28b04ee05359a8e68
      https://github.com/zanata/zanata/commit/2bc9b4cc87d4cdb87e876ca28b04ee05359a8e68
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java

  Log Message:
  -----------
  rhbz915124 - Add permission check when uploading source documents.


  Commit: 21af1fc15741efdf52d2e1294223f834cff582de
      https://github.com/zanata/zanata/commit/21af1fc15741efdf52d2e1294223f834cff582de
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Fix internal authentication resend email error: https://bugzilla.redhat.com/show_bug.cgi?id=915130


  Commit: 5eccd9e1c285d34c3f64642631e32fb9e22fa77c
      https://github.com/zanata/zanata/commit/5eccd9e1c285d34c3f64642631e32fb9e22fa77c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java

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


  Commit: 63a3e92dae6b5ef900d0227925bd9c8ab8d90599
      https://github.com/zanata/zanata/commit/63a3e92dae6b5ef900d0227925bd9c8ab8d90599
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java

  Log Message:
  -----------
  Fix broken rest test.


  Commit: 42aeb24be0801e92bc0e568c5eefc7cc1781f330
      https://github.com/zanata/zanata/commit/42aeb24be0801e92bc0e568c5eefc7cc1781f330
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/server/rpc/ActivateWorkspaceActionSeamTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

  Log Message:
  -----------
  Implement restriction for download file: https://bugzilla.redhat.com/show_bug.cgi?id=913745


  Commit: 5a0dc3653026467c54ed2d540025ab1dac81a09e
      https://github.com/zanata/zanata/commit/5a0dc3653026467c54ed2d540025ab1dac81a09e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java

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


  Commit: a47446f9344bcd5d6ba6030a773904c5efeb40d0
      https://github.com/zanata/zanata/commit/a47446f9344bcd5d6ba6030a773904c5efeb40d0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.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/SearchResultsPresenter.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  Fix unit test


  Commit: 87b7961aba2e124603fd6b574c1fd27220a7df96
      https://github.com/zanata/zanata/commit/87b7961aba2e124603fd6b574c1fd27220a7df96
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/cache/CacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/search/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/resources/META-INF/ehcache.xml
    A zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Bring back caching of TextFlow ID sets


  Commit: c6741a640e769b61c8c91df4943ff6c1f1e205a4
      https://github.com/zanata/zanata/commit/c6741a640e769b61c8c91df4943ff6c1f1e205a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.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/SearchResultsPresenter.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.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/raw/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/server/rpc/ActivateWorkspaceActionSeamTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into integration/master


  Commit: 8919a49eab43634758f66e1ace5123fd7c367d57
      https://github.com/zanata/zanata/commit/8919a49eab43634758f66e1ace5123fd7c367d57
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-war/src/main/resources/META-INF/ehcache.xml

  Log Message:
  -----------
  Cache TextFlow ID sets for 1 day


  Commit: fcf94109bf58b34047666ea9a589c4de0fe71ca5
      https://github.com/zanata/zanata/commit/fcf94109bf58b34047666ea9a589c4de0fe71ca5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

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

  Log Message:
  -----------
  fix last modified in document query


  Commit: 53a8be4cfc4516fb64404c2794328865e9d39734
      https://github.com/zanata/zanata/commit/53a8be4cfc4516fb64404c2794328865e9d39734
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/h2/tools/TriggerAdapter.java
    A zanata-war/src/main/java/org/zanata/cache/CacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/search/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/resources/META-INF/ehcache.xml
    A zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

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


  Commit: 6890c0d44b770efb9e89d154b35c4e2926a62686
      https://github.com/zanata/zanata/commit/6890c0d44b770efb9e89d154b35c4e2926a62686
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/IdFilterFactory.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TranslatedTextFlowFilter.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TranslatedTextFlowFilterFactory.java
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/h2/tools/TriggerAdapter.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    A zanata-war/src/main/java/org/zanata/cache/CacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    A zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/ActivationLinkExpiredException.java
    M zanata-war/src/main/java/org/zanata/process/AsynchronousExecutor.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    A zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    A zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/IndexerProcessHandle.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.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/SearchResultsPresenter.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.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/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/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    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/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/main/resources/META-INF/ehcache.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    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/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    A zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.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/raw/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/server/rpc/ActivateWorkspaceActionSeamTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into seam230final

Conflicts:
	zanata-model/src/main/java/org/zanata/model/HTextFlow.java
	zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
	zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
	zanata-war/src/main/webapp/iteration/files.xhtml


Compare: https://github.com/zanata/zanata/compare/ccedd5c6f980...6890c0d44b77


More information about the zanata-commits mailing list