[zanata/zanata-server] 65f2bc: rhbz882770 - add multi field search support to Fil...

GitHub noreply at github.com
Mon May 12 06:33:22 UTC 2014


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 65f2bc82a5129ef0284e7e197d5234de5e437156
      https://github.com/zanata/zanata-server/commit/65f2bc82a5129ef0284e7e197d5234de5e437156
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/search/ContentCriterion.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    A zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    M zanata-war/src/main/java/org/zanata/util/QueryBuilder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    A zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    A zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  rhbz882770 - add multi field search support to FilterConstraintToQuery


  Commit: e54f9ee6b5d2ab542c191fe14f1b5213f9a588ed
      https://github.com/zanata/zanata-server/commit/e54f9ee6b5d2ab542c191fe14f1b5213f9a588ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/search/FilterConstraintToModalNavigationQuery.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/search/FilterConstraintToModalNavigationQueryTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  rhbz882770 - refactor and move modal navigation query creation into separate class


  Commit: 18626630e59413bac87053657f46596276015cd7
      https://github.com/zanata/zanata-server/commit/18626630e59413bac87053657f46596276015cd7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/search/FilterConstraintToModalNavigationQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    R zanata-war/src/test/java/org/zanata/search/FilterConstraintToModalNavigationQueryTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

  Log Message:
  -----------
  rhbz882770 - convert modal navigation query to use HQL


  Commit: 1c7b72acd96ad23db37f1ea41e1ae940baaf12d2
      https://github.com/zanata/zanata-server/commit/1c7b72acd96ad23db37f1ea41e1ae940baaf12d2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java

  Log Message:
  -----------
  rhbz882770 - refactor to use DocumentId instead of Long


  Commit: f69c6fe4bad12ab48663d2aa84f15b2a759fd7d5
      https://github.com/zanata/zanata-server/commit/f69c6fe4bad12ab48663d2aa84f15b2a759fd7d5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java

  Log Message:
  -----------
  rhbz882770 - refactor FilterConstraintToQuery to share code


  Commit: b752eb093aec9b84f6808c0e6eaea51e6083cad3
      https://github.com/zanata/zanata-server/commit/b752eb093aec9b84f6808c0e6eaea51e6083cad3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java

  Log Message:
  -----------
  rhbz882770 - editor filter accepts all conditions(no filter)


  Commit: de824698bfd3b91091ab5df1b259fc272fd7cd9d
      https://github.com/zanata/zanata-server/commit/de824698bfd3b91091ab5df1b259fc272fd7cd9d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  rhbz882770 - separate search and other conditions to fix a bug


  Commit: 0e14dc3d4c3933235109ecbc53c0beee39ebfac2
      https://github.com/zanata/zanata-server/commit/0e14dc3d4c3933235109ecbc53c0beee39ebfac2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  rhbz882770 - change resource id to exact match


  Commit: 1609d6498263cc4837d4b3f7166604caf45667be
      https://github.com/zanata/zanata-server/commit/1609d6498263cc4837d4b3f7166604caf45667be
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java

  Log Message:
  -----------
  rhbz882770 - add new search field to history token


  Commit: c9342d58579be070a2903cc75265adfe403ae05c
      https://github.com/zanata/zanata-server/commit/c9342d58579be070a2903cc75265adfe403ae05c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java

  Log Message:
  -----------
  rhbz882770 - integrate multi search fields to GetTransUnitActionContext


  Commit: 779782ca45690381149443472512710bf4e54c5f
      https://github.com/zanata/zanata-server/commit/779782ca45690381149443472512710bf4e54c5f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java

  Log Message:
  -----------
  rhbz882770 - rename to editorFilter


  Commit: 35a190921fd8e0b60679bd5e46e056839f5d0b22
      https://github.com/zanata/zanata-server/commit/35a190921fd8e0b60679bd5e46e056839f5d0b22
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java

  Log Message:
  -----------
  rhbz882770 - GetTransUnitList and Navigation use multi field search

- remove a test that is covered by FilterConstraintJpaTest


  Commit: 4e330a7012c63c1dce0c40af71ffe357cf43d6e2
      https://github.com/zanata/zanata-server/commit/4e330a7012c63c1dce0c40af71ffe357cf43d6e2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  rhbz882770 - fix up tests after change


  Commit: fdd3080b435f1f114b20d6f30377ae6778e445eb
      https://github.com/zanata/zanata-server/commit/fdd3080b435f1f114b20d6f30377ae6778e445eb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/ContentCriterion.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

  Log Message:
  -----------
  rhbz882770 - refactor ContentCriterion to make it more readible


  Commit: dfbeb0f1fbf71960cad8a7b4fb3aaa7782fceeae
      https://github.com/zanata/zanata-server/commit/dfbeb0f1fbf71960cad8a7b4fb3aaa7782fceeae
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java

  Log Message:
  -----------
  rhbz882770 - treat empty search consistently in history


  Commit: 8672a26c41e64b345d2b61e3ea385d362a779b8e
      https://github.com/zanata/zanata-server/commit/8672a26c41e64b345d2b61e3ea385d362a779b8e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/main/resources/org/zanata/webtrans/public/search-field-suggestions.js

  Log Message:
  -----------
  rhbz882770 - add search field suggestions script


  Commit: d9d72c8cb4d316962c3b694e8fbf0245dd50695e
      https://github.com/zanata/zanata-server/commit/d9d72c8cb4d316962c3b694e8fbf0245dd50695e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/QueryParser.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/rpc/QueryParserTest.java

  Log Message:
  -----------
  rhbz882770 - add QueryParser gwt class


  Commit: 42f504d431c6c2698c36cbe9e618d48059e99947
      https://github.com/zanata/zanata-server/commit/42f504d431c6c2698c36cbe9e618d48059e99947
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java

  Log Message:
  -----------
  rhbz882770 - update search context using query parsing function


  Commit: 469032d2a2930c52984ee9a8c78aec2343e8b899
      https://github.com/zanata/zanata-server/commit/469032d2a2930c52984ee9a8c78aec2343e8b899
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  rhbz882770 - use latest version of assets


  Commit: a677b1f1550045bf86909ef78b8d37e2678eafa9
      https://github.com/zanata/zanata-server/commit/a677b1f1550045bf86909ef78b8d37e2678eafa9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml

  Log Message:
  -----------
  rhbz882770 - adjust styles for editor search containers


  Commit: 23169adaff88a0c0968cb1db48ef16d292479350
      https://github.com/zanata/zanata-server/commit/23169adaff88a0c0968cb1db48ef16d292479350
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java

  Log Message:
  -----------
  rhbz882770 - add SearchTextBox to allow placeholder and autocomplete attributes


  Commit: 8d21b143e54006442b9e6d96865ddb2375796b59
      https://github.com/zanata/zanata-server/commit/8d21b143e54006442b9e6d96865ddb2375796b59
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchFieldListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java

  Log Message:
  -----------
  rhbz882770 - add EditorSearchField


  Commit: 3f755e4e8bac855f5b7b6788c4a80291e724238d
      https://github.com/zanata/zanata-server/commit/3f755e4e8bac855f5b7b6788c4a80291e724238d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  rhbz882770 - make load from history work smoothly


  Commit: 7f3cdbbfebd01e410164f6ec863aafc4058d362b
      https://github.com/zanata/zanata-server/commit/7f3cdbbfebd01e410164f6ec863aafc4058d362b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml

  Log Message:
  -----------
  add copyright notices to ui.xml files


  Commit: 5bf9c12c867bee09c3fbd379f26519f2dbd9dfc1
      https://github.com/zanata/zanata-server/commit/5bf9c12c867bee09c3fbd379f26519f2dbd9dfc1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    R functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    R zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardUserStats.java
    R zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    A zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    A zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.4.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintained-project.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R zanata-war/src/main/webapp/profile/add_identity.xhtml
    R zanata-war/src/main/webapp/profile/edit.xhtml
    R zanata-war/src/main/webapp/profile/identities.xhtml
    R zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    A zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
    A zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz882770-search


  Commit: 8fc2b0229be745ed91c6ec8d3549eb85bbddeae1
      https://github.com/zanata/zanata-server/commit/8fc2b0229be745ed91c6ec8d3549eb85bbddeae1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/search-field-suggestions.js
    M zanata-war/src/test/java/org/zanata/webtrans/shared/rpc/QueryParserTest.java

  Log Message:
  -----------
  fix checkstyle violations


  Commit: 35dfef1afd00e309163fee5720d954dff3af4855
      https://github.com/zanata/zanata-server/commit/35dfef1afd00e309163fee5720d954dff3af4855
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java

  Log Message:
  -----------
  rhbz882770 - fix failing test of history tokens


  Commit: c927590f2dab82ca26960c0836be5b1a9834d74f
      https://github.com/zanata/zanata-server/commit/c927590f2dab82ca26960c0836be5b1a9834d74f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  clean up database before test


  Commit: c0e09724aa813799619d80ad17c174d228d5daef
      https://github.com/zanata/zanata-server/commit/c0e09724aa813799619d80ad17c174d228d5daef
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/ContentCriterion.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

  Log Message:
  -----------
  rename variables and adding javadoc


  Commit: f64271845916839a9a77b478aa0708fc0a6d34fd
      https://github.com/zanata/zanata-server/commit/f64271845916839a9a77b478aa0708fc0a6d34fd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.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/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java

  Log Message:
  -----------
  rename searchText to edtiroTextSearch in HistoryToken


  Commit: 0526c90c0fde167f755ffe95212217a52831a8ca
      https://github.com/zanata/zanata-server/commit/0526c90c0fde167f755ffe95212217a52831a8ca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/BookmarkedTextFlowEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/EditorPageSizeChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  change immutable object mutator method name


  Commit: 9be1927b37f334a16c4745962e948250ed99cd3c
      https://github.com/zanata/zanata-server/commit/9be1927b37f334a16c4745962e948250ed99cd3c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

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

  Log Message:
  -----------
  rhbz882770 - remove unnecessary logging


  Commit: 56c5d57e472b1e38b2bfbcc5a18c613d4bd2b498
      https://github.com/zanata/zanata-server/commit/56c5d57e472b1e38b2bfbcc5a18c613d4bd2b498
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/QueryParser.java

  Log Message:
  -----------
  rhbz882770 - minor refactors in QueryParser


  Commit: 0a6df4eaa159b1880e138e3348ab56224dd2f345
      https://github.com/zanata/zanata-server/commit/0a6df4eaa159b1880e138e3348ab56224dd2f345
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    R functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    R functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/setup.properties
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/limits/LeakyBucket.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    A zanata-war/src/main/java/org/zanata/limits/RestCallLimiter.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    A zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/Configuration.java
    A zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A zanata-war/src/main/java/org/zanata/util/Introspectable.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    A zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    A zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    A zanata-war/src/test/java/org/zanata/limits/RestCallLimiterTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    A zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/resources/log4j.xml

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

Conflicts:
	zanata-war/src/test/resources/log4j.xml


  Commit: f455a5fa1e98f462ea6f24e3df3b8c24ab16f267
      https://github.com/zanata/zanata-server/commit/f455a5fa1e98f462ea6f24e3df3b8c24ab16f267
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java

  Log Message:
  -----------
  refactor shortcut to go to editor


  Commit: 6971a338b4356ecc9c51c1ad9200e48fd8050b2f
      https://github.com/zanata/zanata-server/commit/6971a338b4356ecc9c51c1ad9200e48fd8050b2f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

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

  Log Message:
  -----------
  add id to editor search field


  Commit: 5b279e874c36a80a0a7a6c2f97fcd578865b31dc
      https://github.com/zanata/zanata-server/commit/5b279e874c36a80a0a7a6c2f97fcd578865b31dc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

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

  Log Message:
  -----------
  update placeholder message for editor filter field


  Commit: 2e3c5b926ad330b57a3646f2d920416589e3d1c7
      https://github.com/zanata/zanata-server/commit/2e3c5b926ad330b57a3646f2d920416589e3d1c7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

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

  Log Message:
  -----------
  add id to loading panel


  Commit: 0400a5644fb15393df42634a639356ac39b30c2a
      https://github.com/zanata/zanata-server/commit/0400a5644fb15393df42634a639356ac39b30c2a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/LoadingPanel.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java

  Log Message:
  -----------
  rhbz882770 - add functional test


  Commit: b8241b199ff21066b2a41d01c4d2e0d8e7c9010f
      https://github.com/zanata/zanata-server/commit/b8241b199ff21066b2a41d01c4d2e0d8e7c9010f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-02 (Fri, 02 May 2014)

  Changed paths:
    R functional-test/src/main/java/org/zanata/page/webtrans/LoadingPanel.java

  Log Message:
  -----------
  delete unused class


  Commit: 9eb178960a3858566d4ac9b8c7af0dd7b99fbcbf
      https://github.com/zanata/zanata-server/commit/9eb178960a3858566d4ac9b8c7af0dd7b99fbcbf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  rhbz882770 - escape _ in query


  Commit: ae195063dfdbab2f937810a0eb159dc06e34bb1c
      https://github.com/zanata/zanata-server/commit/ae195063dfdbab2f937810a0eb159dc06e34bb1c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml

  Log Message:
  -----------
  minor ui change


  Commit: ff7e69aee3227d69d2cb021cd04a7fde35aa43e6
      https://github.com/zanata/zanata-server/commit/ff7e69aee3227d69d2cb021cd04a7fde35aa43e6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/QueryParser.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java

  Log Message:
  -----------
  rhbz882770 - warn user on search filter when there is unsaved change


  Commit: 3e5416cb012fb765ba4214830c7b7600d35ad851
      https://github.com/zanata/zanata-server/commit/3e5416cb012fb765ba4214830c7b7600d35ad851
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java

  Log Message:
  -----------
  rhbz882770 - update functional test after preivous change


  Commit: 3fa4faa8a1745868462882f460c4b77486148742
      https://github.com/zanata/zanata-server/commit/3fa4faa8a1745868462882f460c4b77486148742
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml

  Log Message:
  -----------
  make use of zanata assets global messages to display notification


  Commit: 2f3c2655b016fddaed78e7e9fed94d19da6b110b
      https://github.com/zanata/zanata-server/commit/2f3c2655b016fddaed78e7e9fed94d19da6b110b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java

  Log Message:
  -----------
  rhbz882770 - client side validation for date format


  Commit: f52d008c951d416f22e57698521e165c43fce710
      https://github.com/zanata/zanata-server/commit/f52d008c951d416f22e57698521e165c43fce710
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/QueryParser.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/rpc/QueryParserTest.java

  Log Message:
  -----------
  rhbz882770 - always use a single word for some keys


  Commit: 559b8a8af733d3452e8490bee43a2b00d51361ef
      https://github.com/zanata/zanata-server/commit/559b8a8af733d3452e8490bee43a2b00d51361ef
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/search-field-suggestions.js

  Log Message:
  -----------
  rhbz882770 - prevent mouse highlight of suggestions when mouse does not move, and make sure slow clicks on suggestions will still insert them


  Commit: 94b03c126d44fb400b0535a0000cc6c683a0815d
      https://github.com/zanata/zanata-server/commit/94b03c126d44fb400b0535a0000cc6c683a0815d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/search-field-suggestions.js

  Log Message:
  -----------
  rhbz882770 - keep focus on editor search input when clicking suggestions at any speed


  Commit: 50edbbc2faea860eca1caf72e1e61998002aceff
      https://github.com/zanata/zanata-server/commit/50edbbc2faea860eca1caf72e1e61998002aceff
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml
    M pom.xml
    A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
    R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.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/TargetContentsPresenter.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/TableEditorMessages.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/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.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/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.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/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz882770-search

Conflicts:
	functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
  deleted
	functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
  used version from master
	functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
  used version from master


  Commit: f8a8c0ae243a5d9b87a893a0ff5d045813adb1b1
      https://github.com/zanata/zanata-server/commit/f8a8c0ae243a5d9b87a893a0ff5d045813adb1b1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java

  Log Message:
  -----------
  fix compile errors in functional test


  Commit: 01389ed279e53a9189cc3c0aa09f26f071f3c17f
      https://github.com/zanata/zanata-server/commit/01389ed279e53a9189cc3c0aa09f26f071f3c17f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/search/ContentCriterion.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    M zanata-war/src/main/java/org/zanata/util/QueryBuilder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/BookmarkedTextFlowEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/EditorPageSizeChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.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/DocumentListPresenter.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/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchFieldListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EditorFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/QueryParser.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/main/resources/org/zanata/webtrans/public/search-field-suggestions.js
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    A zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/rpc/QueryParserTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Merge pull request #426 from zanata/rhbz882770-search

Add multiple field search in editor


Compare: https://github.com/zanata/zanata-server/compare/1efb36075f0e...01389ed279e5


More information about the zanata-commits mailing list