[zanata/zanata-server] c6a6d6: Prevent reindex Session leak; mark AsyncTask.getHa...

GitHub noreply at github.com
Fri Jun 20 06:02:12 UTC 2014


  Branch: refs/heads/wildfly
  Home:   https://github.com/zanata/zanata-server
  Commit: c6a6d651df15428ae6e40e7af3e04bd29916319f
      https://github.com/zanata/zanata-server/commit/c6a6d651df15428ae6e40e7af3e04bd29916319f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Prevent reindex Session leak; mark AsyncTask.getHandle() as @Nonnull


  Commit: 543f3dd6233bfae7bc18aed6cb15cad96de599b7
      https://github.com/zanata/zanata-server/commit/543f3dd6233bfae7bc18aed6cb15cad96de599b7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

  Log Message:
  -----------
  Ensure that EntityManagers are closed in tests


  Commit: c0d5409da46f344ca9236e1d011be69d9d74f198
      https://github.com/zanata/zanata-server/commit/c0d5409da46f344ca9236e1d011be69d9d74f198
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java

  Log Message:
  -----------
  Switch LeakListener to slf4j and change logger name


  Commit: e21d51f9675a4c044aa6704ee27082070e6b5f0e
      https://github.com/zanata/zanata-server/commit/e21d51f9675a4c044aa6704ee27082070e6b5f0e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java

  Log Message:
  -----------
  Improve accuracy of time estimates

This should be more accurate when the time to process one progress
unit is only a few milliseconds (or less than one millisecond).


  Commit: 16c1fd7419447c6ececa7eced22280b9d9a30b10
      https://github.com/zanata/zanata-server/commit/16c1fd7419447c6ececa7eced22280b9d9a30b10
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

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

  Log Message:
  -----------
  Stop dependency problems from breaking the build


  Commit: 9de82c9398e8cf53bf26e33bde7b1284047245a9
      https://github.com/zanata/zanata-server/commit/9de82c9398e8cf53bf26e33bde7b1284047245a9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M 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/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateValidationInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/MaintainerAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java

  Log Message:
  -----------
  Refactor to use ServiceLocator instead of Seam's Component class.


  Commit: 0d582b850c72252bbed035dd02eb1539e4e8db74
      https://github.com/zanata/zanata-server/commit/0d582b850c72252bbed035dd02eb1539e4e8db74
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  Revert to use names with service locator.

This is because of a missing API call in Seam Autowire. It should be a part of its replacement when we move to CDI.


  Commit: 4129e3c53d227a91c1dbcb57bac1ac0b292ca8e9
      https://github.com/zanata/zanata-server/commit/4129e3c53d227a91c1dbcb57bac1ac0b292ca8e9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

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

  Log Message:
  -----------
  prepare for next development iteration


  Commit: 402c73ed679f4e2c01ca2d5786485b13c633d87e
      https://github.com/zanata/zanata-server/commit/402c73ed679f4e2c01ca2d5786485b13c633d87e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.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/dashboard/DashboardTest.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/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java

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


  Commit: 1cb216ab3154bdf222dbd9fa3f1cb103aa1b1216
      https://github.com/zanata/zanata-server/commit/1cb216ab3154bdf222dbd9fa3f1cb103aa1b1216
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.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/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Fix failing tests

- Some tests failing for objects not in focus
- Timing issues
- Some logic broke with last defocus change


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java

  Log Message:
  -----------
  update test after element id change


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java

  Log Message:
  -----------
  delete test case where input field is restricted with maxlength


  Commit: 05dfa4aba12849471be480901c6622d6f2ba59f1
      https://github.com/zanata/zanata-server/commit/05dfa4aba12849471be480901c6622d6f2ba59f1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java

  Log Message:
  -----------
  Remove unused imports


  Commit: 6aadeb1cb0467c6c71505b567fbd4988269a712e
      https://github.com/zanata/zanata-server/commit/6aadeb1cb0467c6c71505b567fbd4988269a712e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

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


  Commit: 05c30b7ffa1fc625a4b071c027c96370baee3cdf
      https://github.com/zanata/zanata-server/commit/05c30b7ffa1fc625a4b071c027c96370baee3cdf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-14 (Wed, 14 May 2014)

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

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


  Commit: 12686810f3cf5f7ce202d86f4d27a36b67531a04
      https://github.com/zanata/zanata-server/commit/12686810f3cf5f7ce202d86f4d27a36b67531a04
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.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/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java

  Log Message:
  -----------
  Merge pull request #444 from zanata/more-test-fixes

More test fixes


  Commit: 3060ef70411e47c0c4805f048efc44a7855fac7d
      https://github.com/zanata/zanata-server/commit/3060ef70411e47c0c4805f048efc44a7855fac7d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.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
    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
    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/EditorFilterMessagesTest.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/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.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/language/JoinLanguageTeamTest.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
    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
    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/testharness/ZanataTestCase.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

  Log Message:
  -----------
  Fix test failures and jenkins timeout

- Fix waiting for profile settings to change
- Remove unnecessary editor switch
- Add timeouts to tests
- Expect notifications for validations changes


  Commit: 884c4ddc0f4c432cce96683bcce935027bbbd883
      https://github.com/zanata/zanata-server/commit/884c4ddc0f4c432cce96683bcce935027bbbd883
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

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

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


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java

  Log Message:
  -----------
  fix GetTextPluralSupportTest


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.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/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java

  Log Message:
  -----------
  fix all glossary tests and tests after resteasy upgrade


  Commit: 623783e802993d10300e0a3cd75cd99b993084f4
      https://github.com/zanata/zanata-server/commit/623783e802993d10300e0a3cd75cd99b993084f4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.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/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
    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
    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/EditorFilterMessagesTest.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/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.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/language/JoinLanguageTeamTest.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
    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
    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/testharness/ZanataTestCase.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/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java

  Log Message:
  -----------
  Merge pull request #446 from zanata/again-more-test-fixes

Fix test failures and jenkins timeout


  Commit: b616826f80611f306f47317368768752ef76838e
      https://github.com/zanata/zanata-server/commit/b616826f80611f306f47317368768752ef76838e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/webapp/help/view.xhtml

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


  Commit: ecff50e4ee720061ffd2925618b222743e134f4f
      https://github.com/zanata/zanata-server/commit/ecff50e4ee720061ffd2925618b222743e134f4f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-16 (Fri, 16 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M 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/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateValidationInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/MaintainerAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java

  Log Message:
  -----------
  Merge pull request #438 from zanata/service-locator

Refactor to use ServiceLocator instead of Seam's Component class.


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  prevent StaleElementException


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #448 from zanata/fix-tests

prevent StaleElementException


  Commit: cc3495c59c337af00a1d6fc9136c211a291f143e
      https://github.com/zanata/zanata-server/commit/cc3495c59c337af00a1d6fc9136c211a291f143e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java

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


  Commit: 0408b6483ca24cb11d0307b4add1abdc6f1f8ee9
      https://github.com/zanata/zanata-server/commit/0408b6483ca24cb11d0307b4add1abdc6f1f8ee9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M pom.xml

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


  Commit: 6309507d3401c281b511ca2cce9452e2ee11a4bc
      https://github.com/zanata/zanata-server/commit/6309507d3401c281b511ca2cce9452e2ee11a4bc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

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


  Commit: c6fb09357f4970db6a890f8d8a4b09c956186ec1
      https://github.com/zanata/zanata-server/commit/c6fb09357f4970db6a890f8d8a4b09c956186ec1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

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

  Log Message:
  -----------
  Remove gwt-dev.jar from zanata.war


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

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  rhbz988202 - add default value in tooltip


  Commit: e7396564d348dcedf09b1f49e3654139bd8faa50
      https://github.com/zanata/zanata-server/commit/e7396564d348dcedf09b1f49e3654139bd8faa50
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-21 (Wed, 21 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.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

  Log Message:
  -----------
  rhbz882770 - change date format in search


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

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

  Log Message:
  -----------
  rhbz988202 - add placeholder to show default value


  Commit: 9c4135543cc9ef86ed571c617466352fe8e81cfb
      https://github.com/zanata/zanata-server/commit/9c4135543cc9ef86ed571c617466352fe8e81cfb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

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

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


  Commit: d153feea97885b528790b66fa0465b36749e287d
      https://github.com/zanata/zanata-server/commit/d153feea97885b528790b66fa0465b36749e287d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-22 (Thu, 22 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/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.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
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.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/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/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.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/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    R functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.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
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.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/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
    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/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
    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
    A functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.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
    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
    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
    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/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.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 functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/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/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HProject.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/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.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/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.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/action/validator/DuplicateEmailValidator.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.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/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.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/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    A zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateValidationInterceptor.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/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/Configuration.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.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
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.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/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.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
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.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/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.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/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.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/ui/autocomplete/MaintainerAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    A zanata-war/src/main/java/org/zanata/util/Introspectable.java
    M zanata-war/src/main/java/org/zanata/util/QueryBuilder.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.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/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/TargetContentsPresenter.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/UserConfigHolder.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/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into prevent-reindexer-session-leak

Conflicts:
	zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java


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

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

  Log Message:
  -----------
  fix spelling


  Commit: 4525e82cf43bc2562861058f7aa442b3359b9457
      https://github.com/zanata/zanata-server/commit/4525e82cf43bc2562861058f7aa442b3359b9457
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

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


  Commit: fa2ac564e11847998a1d9d805c3ead3739b73edc
      https://github.com/zanata/zanata-server/commit/fa2ac564e11847998a1d9d805c3ead3739b73edc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-22 (Thu, 22 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.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge pull request #457 from zanata/fix-from-review

rhbz 1100092 - change date format


  Commit: 971828035424bbeac43a54061aa94b742bbb6975
      https://github.com/zanata/zanata-server/commit/971828035424bbeac43a54061aa94b742bbb6975
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 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.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

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


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

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

  Log Message:
  -----------
  rhbz1100131 - fix wrong pattern for parsing date string


  Commit: 1311133f434a064ee419fa1e635eb185cc12a32d
      https://github.com/zanata/zanata-server/commit/1311133f434a064ee419fa1e635eb185cc12a32d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

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

  Log Message:
  -----------
  Merge pull request #455 from zanata/rhbz1099362

Remove gwt-dev.jar from zanata.war


  Commit: 405c6c3c4eca56fbd79e14ccabf6095748135845
      https://github.com/zanata/zanata-server/commit/405c6c3c4eca56fbd79e14ccabf6095748135845
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

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

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


  Commit: 2614042bec26411aa89e693a34591a99503dc7d1
      https://github.com/zanata/zanata-server/commit/2614042bec26411aa89e693a34591a99503dc7d1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-23 (Fri, 23 May 2014)

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

  Log Message:
  -----------
  Merge pull request #462 from zanata/rhbz1100131

rhbz1100131 - fix wrong pattern for parsing date string


  Commit: 746d1f90b11470071dad361f051962923b7a5761
      https://github.com/zanata/zanata-server/commit/746d1f90b11470071dad361f051962923b7a5761
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-05-26 (Mon, 26 May 2014)

  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-3.4.1


  Commit: 722ff435a9d6b06127906affe560c41b026b0e17
      https://github.com/zanata/zanata-server/commit/722ff435a9d6b06127906affe560c41b026b0e17
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-05-26 (Mon, 26 May 2014)

  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: 93321b3e146d725d0fbdf5aceaa21c9d9e03bc8d
      https://github.com/zanata/zanata-server/commit/93321b3e146d725d0fbdf5aceaa21c9d9e03bc8d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.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: ff1a367979318b79d9225214c9bc5e047db48ca3
      https://github.com/zanata/zanata-server/commit/ff1a367979318b79d9225214c9bc5e047db48ca3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/webtrans/server/DispatchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/GwtDispatchService.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  rhbz1099695 - remove seam remoting


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

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

  Log Message:
  -----------
  rhbz1099695 - handle gwt serializable exception


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

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

  Log Message:
  -----------
  rhbz1099695 - not logged in redirect with hash included


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

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

  Log Message:
  -----------
  rhbz1099695 - add comment to class


  Commit: f40569a21fda6b055a27a4a6db687e847564f335
      https://github.com/zanata/zanata-server/commit/f40569a21fda6b055a27a4a6db687e847564f335
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml

  Log Message:
  -----------
  Removed http to allow request to work on secure urls


  Commit: b13f7af8bceb98b829679c0f5c8bcea5cfc0e001
      https://github.com/zanata/zanata-server/commit/b13f7af8bceb98b829679c0f5c8bcea5cfc0e001
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml

  Log Message:
  -----------
  Merge pull request #465 from zanata/bug/font-asset-url-fix-update

Removed http to allow request to work on secure urls


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

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

  Log Message:
  -----------
  rhbz1101803 - fix exception in TMX clear


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java

  Log Message:
  -----------
  fix test after change


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  change from class rule to test rule so that retry rule will work better


  Commit: d5f92ffff7b3f40e9afd90f060a80f4b574fc912
      https://github.com/zanata/zanata-server/commit/d5f92ffff7b3f40e9afd90f060a80f4b574fc912
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/webtrans/server/DispatchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/GwtDispatchService.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #464 from zanata/remote-seam-remote

Remove seam remote


  Commit: fae0ac638ca9e9e83d3dac4cf43aec3ccf5e24d7
      https://github.com/zanata/zanata-server/commit/fae0ac638ca9e9e83d3dac4cf43aec3ccf5e24d7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-28 (Wed, 28 May 2014)

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

  Log Message:
  -----------
  fix sorting in gwt document list: https://bugzilla.redhat.com/show_bug.cgi?id=971652


  Commit: 44341230a412308bd80956b88261ed9d2bc7ca32
      https://github.com/zanata/zanata-server/commit/44341230a412308bd80956b88261ed9d2bc7ca32
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-28 (Wed, 28 May 2014)

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

  Log Message:
  -----------
  Fix copy trans progress not close when cancelled by admin: https://bugzilla.redhat.com/show_bug.cgi?id=1098407


  Commit: 20c4600103515fa2cc3da5b793ac25f897a9eddd
      https://github.com/zanata/zanata-server/commit/20c4600103515fa2cc3da5b793ac25f897a9eddd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-29 (Thu, 29 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/admin/language.xhtml

  Log Message:
  -----------
  Fix breadcrumb for manage language page: https://bugzilla.redhat.com/show_bug.cgi?id=1060629


  Commit: 27c548c57df2f8b22290dec6bc844810ef64cb4d
      https://github.com/zanata/zanata-server/commit/27c548c57df2f8b22290dec6bc844810ef64cb4d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-29 (Thu, 29 May 2014)

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

  Log Message:
  -----------
  make username field readonly in admin view: https://bugzilla.redhat.com/show_bug.cgi?id=978618


  Commit: eb0c0368b7711a8f9b83ef8169721d83d16bcf5b
      https://github.com/zanata/zanata-server/commit/eb0c0368b7711a8f9b83ef8169721d83d16bcf5b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-29 (Thu, 29 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  Refresh statistic in page after copy trans operation: https://bugzilla.redhat.com/show_bug.cgi?id=1094094


  Commit: 40e03a739984a5efdf3985f78f6d3e260ae2117b
      https://github.com/zanata/zanata-server/commit/40e03a739984a5efdf3985f78f6d3e260ae2117b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-29 (Thu, 29 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml

  Log Message:
  -----------
  fix project search with hyphen and space: https://bugzilla.redhat.com/show_bug.cgi?id=1102455


  Commit: 583ee5be445fb76e9f138200bad2bf04614ac64a
      https://github.com/zanata/zanata-server/commit/583ee5be445fb76e9f138200bad2bf04614ac64a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Merge pull request #466 from zanata/fix-tests

rhbz1101803 - fix TMX clear function


  Commit: d8f2deae07b72c7a14bb21e3b7b058efea6eca26
      https://github.com/zanata/zanata-server/commit/d8f2deae07b72c7a14bb21e3b7b058efea6eca26
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml

  Log Message:
  -----------
  Merge pull request #475 from zanata/rhbz1102455

fix project search with hyphen and space


  Commit: 2a5f2dfa38bef6925700342bfcc4ea1dd369e221
      https://github.com/zanata/zanata-server/commit/2a5f2dfa38bef6925700342bfcc4ea1dd369e221
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml

  Log Message:
  -----------
  remove unused form which cause exception: https://bugzilla.redhat.com/show_bug.cgi?id=1103538


  Commit: 0a6defd08789c6f63245ba15f13b4553e1525160
      https://github.com/zanata/zanata-server/commit/0a6defd08789c6f63245ba15f13b4553e1525160
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml

  Log Message:
  -----------
  Merge pull request #476 from zanata/rhbz1103538

remove unused form which cause exception


  Commit: 99da54e5c8d5a3af1c9353e7528e0f791bc1b292
      https://github.com/zanata/zanata-server/commit/99da54e5c8d5a3af1c9353e7528e0f791bc1b292
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  Merge pull request #470 from zanata/rhbz1098407

Fix copy trans progress not close when cancelled by admin


  Commit: 7b8e7180c24effede93655c39af4daedd7913abb
      https://github.com/zanata/zanata-server/commit/7b8e7180c24effede93655c39af4daedd7913abb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  display 'no content' for empty doc: https://bugzilla.redhat.com/show_bug.cgi?id=1103547


  Commit: 32564e44f4bb987863d394560f3ac07f10bfb88a
      https://github.com/zanata/zanata-server/commit/32564e44f4bb987863d394560f3ac07f10bfb88a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/admin/language.xhtml

  Log Message:
  -----------
  Merge pull request #472 from zanata/rhbz1034551

Fix breadcrumb for manage language page


  Commit: 28a9ba40536dad2a904c0e41fa76f1e7b6cb9d92
      https://github.com/zanata/zanata-server/commit/28a9ba40536dad2a904c0e41fa76f1e7b6cb9d92
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  Merge pull request #474 from zanata/rhbz1094094

Refresh statistic in page after copy trans operation


  Commit: a5eab591a3cdb4e5976450631bf1e00b59e0f8ca
      https://github.com/zanata/zanata-server/commit/a5eab591a3cdb4e5976450631bf1e00b59e0f8ca
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  reduce the loading delay in tab: https://bugzilla.redhat.com/show_bug.cgi?id=1103930


  Commit: 5e1b6d0e3d0f452b2361e66883a436aa9bfff079
      https://github.com/zanata/zanata-server/commit/5e1b6d0e3d0f452b2361e66883a436aa9bfff079
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

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

  Log Message:
  -----------
  rhbz1103940 - do not show info level notification in popup


  Commit: d67d6745a448b0f9df16e99381b9ecaf83a0e4ce
      https://github.com/zanata/zanata-server/commit/d67d6745a448b0f9df16e99381b9ecaf83a0e4ce
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

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

  Log Message:
  -----------
  Merge pull request #460 from zanata/rhbz1099736

Increase cache retention for statistics


  Commit: 93da9d128555002c4553f8deaa8513e6d3bf8d7f
      https://github.com/zanata/zanata-server/commit/93da9d128555002c4553f8deaa8513e6d3bf8d7f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java

  Log Message:
  -----------
  Improve accuracy of time estimates

This should be more accurate when the time to process one progress
unit is only a few milliseconds (or less than one millisecond).
(cherry picked from commit e21d51f9675a4c044aa6704ee27082070e6b5f0e)


  Commit: 73de58ee569decfefa1f69aad8debab2c7e47f52
      https://github.com/zanata/zanata-server/commit/73de58ee569decfefa1f69aad8debab2c7e47f52
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #477 from zanata/fix-empty-content

display 'no content' for empty doc


  Commit: f95143418a719778863b027e53985ca6f7fab200
      https://github.com/zanata/zanata-server/commit/f95143418a719778863b027e53985ca6f7fab200
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml

  Log Message:
  -----------
  fix Dialog 'Invalid translation' popup


  Commit: 50b145f108db607718eb919fc7b93e988022bc2b
      https://github.com/zanata/zanata-server/commit/50b145f108db607718eb919fc7b93e988022bc2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java

  Log Message:
  -----------
  Merge branch 'release' into rhbz1103947


  Commit: e9a0929623be996026db63858cdac5a08d75a7ed
      https://github.com/zanata/zanata-server/commit/e9a0929623be996026db63858cdac5a08d75a7ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Remove unused images and seam component


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

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/webtrans/server/DispatchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/GwtDispatchService.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Cherry-pick 'Remove seam remoting' commits: ff1a367 ee9c0a5 064bb2f cd0198d


  Commit: 88b998e926d54b84a3b33fd7fa9a7b6501ff1b92
      https://github.com/zanata/zanata-server/commit/88b998e926d54b84a3b33fd7fa9a7b6501ff1b92
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  cleanup of unused dependency


  Commit: 7aa7e94721f2d8b36aac51e84c1a96fe0c75cf15
      https://github.com/zanata/zanata-server/commit/7aa7e94721f2d8b36aac51e84c1a96fe0c75cf15
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  update jboss-deployment-structure


  Commit: a01965f65132c01973214e6057f1fcf3efd5ee44
      https://github.com/zanata/zanata-server/commit/a01965f65132c01973214e6057f1fcf3efd5ee44
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  remove version for hibernate-commons-annotations


  Commit: 94da9ae65ffe85c42f41379472b421fd40e6c8f7
      https://github.com/zanata/zanata-server/commit/94da9ae65ffe85c42f41379472b421fd40e6c8f7
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java

  Log Message:
  -----------
  Add a JBoss SSO Login module.


  Commit: 98ea6cd231e8709ed2ec6a7154800535249149f7
      https://github.com/zanata/zanata-server/commit/98ea6cd231e8709ed2ec6a7154800535249149f7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  reorganise jboss-deployment


  Commit: 77937d84040aa3d7d111fc2d3cae30880d1ec1a9
      https://github.com/zanata/zanata-server/commit/77937d84040aa3d7d111fc2d3cae30880d1ec1a9
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #482 from zanata/rhbz1103930

reduce the loading delay in tab


  Commit: 1a445397a34bea96c1ac3bf2072d635f5b4ed342
      https://github.com/zanata/zanata-server/commit/1a445397a34bea96c1ac3bf2072d635f5b4ed342
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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


  Commit: be946277a66bcbe82d238b91a1edcb54913bc663
      https://github.com/zanata/zanata-server/commit/be946277a66bcbe82d238b91a1edcb54913bc663
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java

  Log Message:
  -----------
  Add explicit dependencies.

JBoss SSO Login module code refactoring to bring it in line with other JAAS LoginModules.
Stop maven dependency plugin from failing the build.


  Commit: 5204cc5444c858a9662a8a16a327adbff296ff57
      https://github.com/zanata/zanata-server/commit/5204cc5444c858a9662a8a16a327adbff296ff57
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

  Log Message:
  -----------
  Merge pull request #417 from zanata/prevent-reindexer-session-leak

Prevent reindexer session leak


  Commit: c343ba7ca150a15e0232d0a940cf09978bcc40d1
      https://github.com/zanata/zanata-server/commit/c343ba7ca150a15e0232d0a940cf09978bcc40d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

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

  Log Message:
  -----------
  Allow firing of onValueChange from plain text area


  Commit: b0ef54d0f6e7bc56293b48d506d813775af74e11
      https://github.com/zanata/zanata-server/commit/b0ef54d0f6e7bc56293b48d506d813775af74e11
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml

  Log Message:
  -----------
  remove unused form which cause exception: https://bugzilla.redhat.com/show_bug.cgi?id=1103538


  Commit: 8caaa8ce1b8bcfd36b9c69bb20977eef06521932
      https://github.com/zanata/zanata-server/commit/8caaa8ce1b8bcfd36b9c69bb20977eef06521932
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  replace spacing with <h:outputText value=


  Commit: 1bf222ab85177a50df95569cdacb12f188fdace4
      https://github.com/zanata/zanata-server/commit/1bf222ab85177a50df95569cdacb12f188fdace4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  add comment for hibernate-commons-annotations


  Commit: f92660147109ce9d8165d23d596b6c4952593c59
      https://github.com/zanata/zanata-server/commit/f92660147109ce9d8165d23d596b6c4952593c59
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

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

  Log Message:
  -----------
  Fix position on textflow in editor after validation popup


  Commit: 619c6e9c28cbf07fa43f42899503a18014f1e8b2
      https://github.com/zanata/zanata-server/commit/619c6e9c28cbf07fa43f42899503a18014f1e8b2
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/webtrans/server/DispatchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/GwtDispatchService.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #487 from zanata/cherry-pick-rhbz1099695

Cherry-pick 'Remove seam remoting' commits: ff1a367 ee9c0a5 064bb2f cd01...


  Commit: a5f5801f166827a704db600673c1b98936181edb
      https://github.com/zanata/zanata-server/commit/a5f5801f166827a704db600673c1b98936181edb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

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

  Log Message:
  -----------
  Merge pull request #473 from zanata/rhbz978618

make username field readonly in admin view


  Commit: 1c4fd47f0c2e20f8092ec422f48866a658b9e9e6
      https://github.com/zanata/zanata-server/commit/1c4fd47f0c2e20f8092ec422f48866a658b9e9e6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

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

  Log Message:
  -----------
  Merge pull request #483 from zanata/reduce-notification

rhbz1103940 - do not show info level notification in popup


  Commit: 394d99c317a269dacc475dfcb68b4501ecb330c1
      https://github.com/zanata/zanata-server/commit/394d99c317a269dacc475dfcb68b4501ecb330c1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

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

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


  Commit: 031cd8989911dc52463a6dcbb6727f7a790d481a
      https://github.com/zanata/zanata-server/commit/031cd8989911dc52463a6dcbb6727f7a790d481a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml

  Log Message:
  -----------
  Add subtitle files as translatable formats.

The SubRip Text, WebVTT and SubView formats are a moderately
global format for translating and displaying subtitles in videos.
Okapi provided a nice interface via the Regex Filter for upload.
New extensions supported are srt, vtt, sbt and sub.


  Commit: 2c5b438a816b0d2c3667144c0ca4c13acde06a06
      https://github.com/zanata/zanata-server/commit/2c5b438a816b0d2c3667144c0ca4c13acde06a06
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add iText for PDF/email support in JavaMelody


  Commit: 94cac7259a6e7d740fdd4c33822ca025d4e84e5d
      https://github.com/zanata/zanata-server/commit/94cac7259a6e7d740fdd4c33822ca025d4e84e5d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Moved Seam bom to be the last bom


  Commit: 06ad789f4ae8af1ca458ec0e282c351b550d68eb
      https://github.com/zanata/zanata-server/commit/06ad789f4ae8af1ca458ec0e282c351b550d68eb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  Mark more dependencies as provided


  Commit: 5efc86be8292828d2f9448250f3518b0df77467f
      https://github.com/zanata/zanata-server/commit/5efc86be8292828d2f9448250f3518b0df77467f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Add paging for manage user page: https://bugzilla.redhat.com/show_bug.cgi?id=1107882


  Commit: 4fde3caa207b47b43b14823eafe32565e5f44594
      https://github.com/zanata/zanata-server/commit/4fde3caa207b47b43b14823eafe32565e5f44594
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  Enable action drop down in version: https://bugzilla.redhat.com/show_bug.cgi?id=1109611


  Commit: 7fee48e2d51806d68c3641b6388143be48f9620d
      https://github.com/zanata/zanata-server/commit/7fee48e2d51806d68c3641b6388143be48f9620d
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Merge pull request #491 from zanata/rhbz1107882

Add paging for manage user page


  Commit: 21d6370e4c1fbed7421316cd1a92609070e3d0fb
      https://github.com/zanata/zanata-server/commit/21d6370e4c1fbed7421316cd1a92609070e3d0fb
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml

  Log Message:
  -----------
  Merge pull request #485 from zanata/rhbz1103947

fix Dialog 'Invalid translation' popup


  Commit: fa99636b34e5fb20cbbd8793ff4783eee2876f75
      https://github.com/zanata/zanata-server/commit/fa99636b34e5fb20cbbd8793ff4783eee2876f75
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Update and fix administration tests

- Use assertj instead of hamcrest
- remove change username test (invalid)
- add admin change user password test
- formatting cleanup


  Commit: 47ff0bac0971b97ee67fa6bed375b5c0aa7b79a8
      https://github.com/zanata/zanata-server/commit/47ff0bac0971b97ee67fa6bed375b5c0aa7b79a8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml

  Log Message:
  -----------
  Merge pull request #359 from zanata/srt-support

Add subtitle files as translatable formats.


  Commit: 8df9a6a483c4192c655c6d137140312e58b066f4
      https://github.com/zanata/zanata-server/commit/8df9a6a483c4192c655c6d137140312e58b066f4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java

  Log Message:
  -----------
  add annotation and test run listener to enable recording zanata features


  Commit: d6297b849dc95b5641d4ea33fe5d5132f670bcc4
      https://github.com/zanata/zanata-server/commit/d6297b849dc95b5641d4ea33fe5d5132f670bcc4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java

  Log Message:
  -----------
  add support to record TCMS test case and plan


  Commit: f9bfda8c5f19a708e5fa2b32d7af400f1d965d74
      https://github.com/zanata/zanata-server/commit/f9bfda8c5f19a708e5fa2b32d7af400f1d965d74
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Merge branch 'release' into rhbz1109611


  Commit: f05859e94636cbc4046feeffc697e2481bf31cbe
      https://github.com/zanata/zanata-server/commit/f05859e94636cbc4046feeffc697e2481bf31cbe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java

  Log Message:
  -----------
  Fix functional test


  Commit: cf2188e9aef2f78f5b47ed1160de8e6b5aaaa909
      https://github.com/zanata/zanata-server/commit/cf2188e9aef2f78f5b47ed1160de8e6b5aaaa909
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Use feature inventory on a per test basis

Add the Feature annotation to individual tests for validation
test of concept.

Also:
- stabilise the maintaner settings functions, as they were a
bit flaky
- better checks for the version link as, in some cases, the
Translate Options menu is detected instead


  Commit: aba2c63cb761f0779ae0961352fb83fcbc2f23eb
      https://github.com/zanata/zanata-server/commit/aba2c63cb761f0779ae0961352fb83fcbc2f23eb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java

  Log Message:
  -----------
  Fix functional test


  Commit: cb8a130430989f27a564d0ef0ae325065fb4af1c
      https://github.com/zanata/zanata-server/commit/cb8a130430989f27a564d0ef0ae325065fb4af1c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #413 from zanata/feature-inventory

add annotation and test run listener to enable recording zanata features


  Commit: 65dfb90c81cd82a600716bc214bf1120d1c99694
      https://github.com/zanata/zanata-server/commit/65dfb90c81cd82a600716bc214bf1120d1c99694
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/serialid-wordstat' into rhbz1067288


  Commit: 70c8d20891f3e9d3326ecfc056f649e1eee4297d
      https://github.com/zanata/zanata-server/commit/70c8d20891f3e9d3326ecfc056f649e1eee4297d
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  Merge pull request #492 from zanata/rhbz1109611

Enable action drop down in version


  Commit: 636dc1848d5df1478d9b2b8075b8d35294b042d9
      https://github.com/zanata/zanata-server/commit/636dc1848d5df1478d9b2b8075b8d35294b042d9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java


  Commit: 85c7bce5544fae49c81a7725274f6c7c42425db4
      https://github.com/zanata/zanata-server/commit/85c7bce5544fae49c81a7725274f6c7c42425db4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #494 from zanata/update-to-assertj-admin

Update and fix administration tests


  Commit: 2df53679d8c4c9600748818bac7328a272ab2a68
      https://github.com/zanata/zanata-server/commit/2df53679d8c4c9600748818bac7328a272ab2a68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Move eventservice-rpc back to compile scope


  Commit: 421501dfef767db0ba2881836c36b3e3234ff1a2
      https://github.com/zanata/zanata-server/commit/421501dfef767db0ba2881836c36b3e3234ff1a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge pull request #490 from zanata/serialid-wordstat

Add explicit serialVersionUID to subclasses of AbstractStatistic


  Commit: 9555dad5722e4f87f0601117c941e3c0ed351db3
      https://github.com/zanata/zanata-server/commit/9555dad5722e4f87f0601117c941e3c0ed351db3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java

  Log Message:
  -----------
  Merge pull request #488 from zanata/jboss-sso

Add a JBoss SSO Login module.


  Commit: 23e5eed79d3933d053d65602dfb319adb4e713a6
      https://github.com/zanata/zanata-server/commit/23e5eed79d3933d053d65602dfb319adb4e713a6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A 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/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.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/search.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

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


  Commit: de5cb5a4141fd3daedca8a058249303412d774d8
      https://github.com/zanata/zanata-server/commit/de5cb5a4141fd3daedca8a058249303412d774d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Replace jcommander Lists with guava Lists


  Commit: f9d5c0a41dc5a580cc7c0497cad0255147bf4826
      https://github.com/zanata/zanata-server/commit/f9d5c0a41dc5a580cc7c0497cad0255147bf4826
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A 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/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.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/search.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

  Log Message:
  -----------
  Merge branch 'rhbz1067288' of github.com:zanata/zanata-server into rhbz1067288


  Commit: 8007166ae143d09992ab379853c52e25f241945a
      https://github.com/zanata/zanata-server/commit/8007166ae143d09992ab379853c52e25f241945a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Fix whitespace causing language list not loading: https://bugzilla.redhat.com/show_bug.cgi?id=1109653


  Commit: 02c2c47f3d6bc83130c4715d320dbc50a80d0806
      https://github.com/zanata/zanata-server/commit/02c2c47f3d6bc83130c4715d320dbc50a80d0806
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Remove unused import


  Commit: 14298a88c5be1d6dbdedf48d3987b622580cb032
      https://github.com/zanata/zanata-server/commit/14298a88c5be1d6dbdedf48d3987b622580cb032
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java

  Log Message:
  -----------
  Update comments


  Commit: 20b007e67c05e8b69a8ab4b661adc53e89019839
      https://github.com/zanata/zanata-server/commit/20b007e67c05e8b69a8ab4b661adc53e89019839
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Merge pull request #501 from zanata/rhbz1109653

Fix whitespace causing language list not loading


  Commit: d3b41046ef626f130e323f47a4aaad4d5f4beed6
      https://github.com/zanata/zanata-server/commit/d3b41046ef626f130e323f47a4aaad4d5f4beed6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Remove unused page


  Commit: e07f565a75547f6e6a16bce149f390b21bb7c7df
      https://github.com/zanata/zanata-server/commit/e07f565a75547f6e6a16bce149f390b21bb7c7df
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

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


  Commit: eb8e744f325c706b24c1f31709bf4e336f096862
      https://github.com/zanata/zanata-server/commit/eb8e744f325c706b24c1f31709bf4e336f096862
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Fix Hibernate/H2 warnings in tests


  Commit: ebbaeca5dd9500a5a6f8698c62fb7034844b7dac
      https://github.com/zanata/zanata-server/commit/ebbaeca5dd9500a5a6f8698c62fb7034844b7dac
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge pull request #503 from zanata/fix-hibernate-h2-warnings

Fix Hibernate/H2 warnings in tests


  Commit: abab9590f1b412c1b8fb09cc2deae8c8f76e9a55
      https://github.com/zanata/zanata-server/commit/abab9590f1b412c1b8fb09cc2deae8c8f76e9a55
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

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


  Commit: dcde0a7fb937e4c75ccffd36d52ed8362b89732f
      https://github.com/zanata/zanata-server/commit/dcde0a7fb937e4c75ccffd36d52ed8362b89732f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java

  Log Message:
  -----------
  Add more sort options into version doc list: https://bugzilla.redhat.com/show_bug.cgi?id=1110959


  Commit: b2a10a06eea4571442b184d8312a9ac520726e92
      https://github.com/zanata/zanata-server/commit/b2a10a06eea4571442b184d8312a9ac520726e92
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.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

  Log Message:
  -----------
  Convert to assertj and clean up Account tests

- Annotate feature inventory
- Replace hamcrest with assertj
- Remove some unnecessary steps
- Add 'throws Exception' on tests
- Start using static variables for page messages


  Commit: 5b0bed830c522d901913211d6b4e439ae80a895e
      https://github.com/zanata/zanata-server/commit/5b0bed830c522d901913211d6b4e439ae80a895e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

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


  Commit: 99b5e1e1f21660467aceb7120d398a8b565ea126
      https://github.com/zanata/zanata-server/commit/99b5e1e1f21660467aceb7120d398a8b565ea126
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #471 from zanata/javamelody-email

Add iText for PDF/email support in JavaMelody


  Commit: 14b9970b0b1597dd167c3e4a0177020a4ad5bd4b
      https://github.com/zanata/zanata-server/commit/14b9970b0b1597dd167c3e4a0177020a4ad5bd4b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

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


  Commit: b9435301cfc2933ce5aba1aab8ad3495a3a46df7
      https://github.com/zanata/zanata-server/commit/b9435301cfc2933ce5aba1aab8ad3495a3a46df7
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.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

  Log Message:
  -----------
  Merge pull request #437 from zanata/update-to-assertj

Convert to assertj and clean up Account tests


  Commit: be0c9b67be7efa937b6fa073cb75ced5003a3949
      https://github.com/zanata/zanata-server/commit/be0c9b67be7efa937b6fa073cb75ced5003a3949
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Merge pull request #463 from zanata/rhbz1067288

Cleanup dependency and unused files


  Commit: ab5e864800fcb8564cc88e4bb0a1ab793bc8fe9e
      https://github.com/zanata/zanata-server/commit/ab5e864800fcb8564cc88e4bb0a1ab793bc8fe9e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge pull request #502 from zanata/remove-unused-page

Remove unused page


  Commit: 9c117767108997ba963ad5d9f2a1a3f26b65cf6f
      https://github.com/zanata/zanata-server/commit/9c117767108997ba963ad5d9f2a1a3f26b65cf6f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
  Merge pull request #504 from zanata/rhbz1110959

Add more sort options into version doc list: https://bugzilla.redhat.com...


  Commit: aeda68f10cddedbdde9c38a35fbb2ca0b1b8a9ae
      https://github.com/zanata/zanata-server/commit/aeda68f10cddedbdde9c38a35fbb2ca0b1b8a9ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 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/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.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
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A 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
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.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/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.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/language/JoinLanguageTeamTest.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
    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
    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/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.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
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M 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/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateValidationInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/MaintainerAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.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/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/server/DispatchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/GwtDispatchService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.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/TransUnitUpdateHelper.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/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
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    A zanata-war/src/main/webapp/admin/language.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.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/search.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

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

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml


Compare: https://github.com/zanata/zanata-server/compare/2b78112d4b34...aeda68f10cdd


More information about the zanata-commits mailing list