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

GitHub noreply at github.com
Fri Sep 26 00:15:31 UTC 2014


  Branch: refs/heads/release
  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: 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

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

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


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

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

  Log Message:
  -----------
  Change versionStatisticCache to be eternal with overflow to disk: https://bugzilla.redhat.com/show_bug.cgi?id=1099736


  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: 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: 0f12f77cbdccfa2fe3510eb29964598eb679bf1c
      https://github.com/zanata/zanata-server/commit/0f12f77cbdccfa2fe3510eb29964598eb679bf1c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

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

  Log Message:
  -----------
  add path for ehcache file


  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: 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: 2dd3e41a09cc26e26bc8eaae7d09a1f39ff79493
      https://github.com/zanata/zanata-server/commit/2dd3e41a09cc26e26bc8eaae7d09a1f39ff79493
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/ResolvesPermissions.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Extract application permissions from a drools file and into Java code.


  Commit: 760d1c302074118125dd5e85c4036e8024790bdf
      https://github.com/zanata/zanata-server/commit/760d1c302074118125dd5e85c4036e8024790bdf
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/Action.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Resolve checkstyle violations.


  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: 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: 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: 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: 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: 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: f5efbfbd56530692caeda23365162b7b09880378
      https://github.com/zanata/zanata-server/commit/f5efbfbd56530692caeda23365162b7b09880378
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-11 (Wed, 11 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

  Log Message:
  -----------
  Add explicit serialVersionUID to subclasses of AbstractStatistic


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

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

  Log Message:
  -----------
  Clear ehcaches before and after each JPA test


  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: 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: 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: 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: 33dc80fb775f788db03f4e25bcdd7947ea4a2848
      https://github.com/zanata/zanata-server/commit/33dc80fb775f788db03f4e25bcdd7947ea4a2848
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/VersionGroupHomeAction.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
    R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Remove CachedMethodResult annotation and interceptors.

Replace that functionality with other types of in-memory caching.
In some scenarios, the annotation itself was not doing much or was simply not active due to the class-level annotation not being present.


  Commit: 47bc12a889d0f48865bb4d7574298e0c87f5d74f
      https://github.com/zanata/zanata-server/commit/47bc12a889d0f48865bb4d7574298e0c87f5d74f
  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/action/AccountMergeAction.java
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.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/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Redesign account merge page: https://bugzilla.redhat.com/show_bug.cgi?id=1110048


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

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

  Log Message:
  -----------
  Add a missing clear for a cache map.


  Commit: bf3ca0382565c757f02a7b7420605974a43d7d95
      https://github.com/zanata/zanata-server/commit/bf3ca0382565c757f02a7b7420605974a43d7d95
  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/action/AccountMergeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  Redesign account merge page to match login page


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Remove unnecessary comments and obsolete secruity.drl file.


  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: 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: 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: 1a1326ce96dabf0390c323f9d5a5ae1dab80e191
      https://github.com/zanata/zanata-server/commit/1a1326ce96dabf0390c323f9d5a5ae1dab80e191
  Author: Carlos A. Munoz <camunoz 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/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.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/TranslationMemoryAction.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/dao/ProjectDAO.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/ui/AbstractSortAction.java
    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/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/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/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/admin/language.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/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/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into sec-functions


  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: d04498df3ae48d99917ee119a4fd891f3b9452a2
      https://github.com/zanata/zanata-server/commit/d04498df3ae48d99917ee119a4fd891f3b9452a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Remove unused messages string


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

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

  Log Message:
  -----------
  Re-phrase merge account messages


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

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Remove security.drl file from the Arquillian deployment.


  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: 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: 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: 1010c77be79a42a1761bb836bd5e4299fbe769f0
      https://github.com/zanata/zanata-server/commit/1010c77be79a42a1761bb836bd5e4299fbe769f0
  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/dashboard/DashboardBasePage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java

  Log Message:
  -----------
  Add the Feature summary annotation to Dashboard tests

Also use static variables for page messages


  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: b433d8197a213c171aeaf68bf7984dc45d6dfdb2
      https://github.com/zanata/zanata-server/commit/b433d8197a213c171aeaf68bf7984dc45d6dfdb2
  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/webtrans/EditorPage.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

  Log Message:
  -----------
  Update concurrent edit tests to assertj

Also add feature inventory annotation.


  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: 810d8950ff136676d467b563969566356c349d8b
      https://github.com/zanata/zanata-server/commit/810d8950ff136676d467b563969566356c349d8b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

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

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


  Commit: 26379c8a04191e25b64c8f88e07f57d2985ed0f8
      https://github.com/zanata/zanata-server/commit/26379c8a04191e25b64c8f88e07f57d2985ed0f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-23 (Mon, 23 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/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/dashboardsettings/DashboardAccountTab.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/page/utility/HomePage.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/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.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-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.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/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    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/main/java/org/zanata/util/UrlUtil.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/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/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/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-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/pages.xml
    M zanata-war/src/main/webapp/admin/search.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/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/search.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.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 branch 'integration/master' into rhbz1110048

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/Action.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    R zanata-war/src/main/java/org/zanata/security/permission/ResolvesPermissions.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Create a new PermissionGranter class to perform invocations of granter methods.

Also validate that all arguments in a granter method are provided if the granter is to be invoked.
Keep granter methods indexed by the action(s) they apply to.
Make sure granters are only called if necessary.


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

  Changed paths:
    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

  Log Message:
  -----------
  Replace hamcrest with assertj, annotate and clean up

Uses assertj for tests and improves the formatting of the code.
Adds Feature inventory annotation.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  Merge pull request #499 from zanata/rhbz1110048

Redesign account merge page


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.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

  Log Message:
  -----------
  Fix and update the admin language management tests

Add Feature inventory annotation
Fix added language check in project
Update to assertj


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

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

  Log Message:
  -----------
  reduce StaleElementException


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java

  Log Message:
  -----------
  fix page after code change


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java

  Log Message:
  -----------
  fix/improve test stability


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

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

  Log Message:
  -----------
  Update misc tests to assertj and annotate Feature


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/VersionGroupHomeAction.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
    R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Merge pull request #497 from zanata/remove-cache-method-results

Remove CachedMethodResult annotation and interceptors.


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

  Changed paths:
    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/projects/projectsettings/ProjectPermissionsTab.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

  Log Message:
  -----------
  Update to assertj and fix project tests

Replace hamcrest with assertj
Some items would fail for not being in focus - use scrolling
Add Feature inventory annotations
Fix maintainer list read function


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Move test logout to base class

Move logout condition to base class
Fix maintainer list locator


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

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    R 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/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    R 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
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.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
    A zanata-war/src/main/java/org/zanata/dao/NativeQuery.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
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java

  Log Message:
  -----------
  Merge branch 'optimize-copytrans' into integration/master

Conflicts:
	functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
	zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
	zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
	zanata-war/src/main/webapp/iteration/view.xhtml


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java

  Log Message:
  -----------
  add ensure log out rule


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

  Changed paths:
    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

  Log Message:
  -----------
  Update project version tests to assertj

Also add feature annotations
Clean up and streamline some tests


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java

  Log Message:
  -----------
  Update project search test to assertj


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Press the signup button to check email errors and remove unused imports


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java

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

Fix tests


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-parent


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "Update zanata-parent"

This reverts commit 49c0e3ed9bc6fd24e9f4a812f2373f25cbdfa97a.


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

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

  Log Message:
  -----------
  Update zanata-parent; make enforcer happy again


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

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

  Log Message:
  -----------
  Merge pull request #516 from zanata/enforcer-rules

Update zanata-parent; make enforcer happy again


  Commit: 24a432e3f49b5ed36b11dc74eb8949c5b3a6a88c
      https://github.com/zanata/zanata-server/commit/24a432e3f49b5ed36b11dc74eb8949c5b3a6a88c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Formatting changes and code review updates.

Correct some code formatting and tweak some of the security rules that although equivalent to the drools rule, were incorrect in terms of business logic.


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java

  Log Message:
  -----------
  Merge pull request #505 from zanata/add-feature-summary-dashboard

Add the Feature summary annotation to Dashboard tests


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Rename version group test

'Full' is misleading.


  Commit: a5c1592b63edd52fc9ef8555cf0f7e31a4df07cd
      https://github.com/zanata/zanata-server/commit/a5c1592b63edd52fc9ef8555cf0f7e31a4df07cd
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Update version group tests to assertj, add Feature annotation


  Commit: 705d6dd7fb9372c4dbc033662a30a3691df69ca2
      https://github.com/zanata/zanata-server/commit/705d6dd7fb9372c4dbc033662a30a3691df69ca2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    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

  Log Message:
  -----------
  Update clientserver tests to assertj

Also add Feature annotations and do some reformatting


  Commit: a62e4d948848f0b3cf99041cbcb5f7247c776dff
      https://github.com/zanata/zanata-server/commit/a62e4d948848f0b3cf99041cbcb5f7247c776dff
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  rhbz1114421 - able to test reset password


  Commit: e97042e822741591bc51443852210e875615597b
      https://github.com/zanata/zanata-server/commit/e97042e822741591bc51443852210e875615597b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Merge pull request #519 from zanata/assertj-versiongroup-tests

Update version group tests to assertj, add Feature annotation


  Commit: 5b405d08f4fa21de9021c368fe89a72d106a9e90
      https://github.com/zanata/zanata-server/commit/5b405d08f4fa21de9021c368fe89a72d106a9e90
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  fix page after UI change


  Commit: 8785707dd2f1af401241ec53a52ae9e0defa098f
      https://github.com/zanata/zanata-server/commit/8785707dd2f1af401241ec53a52ae9e0defa098f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java

  Log Message:
  -----------
  Merge pull request #515 from zanata/assertj-search-test

Update project search test to assertj


  Commit: b41269c6278f67ae9cc46016f9d685acd47a12d8
      https://github.com/zanata/zanata-server/commit/b41269c6278f67ae9cc46016f9d685acd47a12d8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    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

  Log Message:
  -----------
  Merge pull request #514 from zanata/assertj-projectversion

Update project version tests to assertj


  Commit: 876ef640c5c25066e65c9efb81deecbeb2cd6b5f
      https://github.com/zanata/zanata-server/commit/876ef640c5c25066e65c9efb81deecbeb2cd6b5f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.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

  Log Message:
  -----------
  Merge pull request #510 from zanata/assertj-language-tests

Fix and update the admin language management tests


  Commit: 38e8d7b62180d5fc3a8c3d8a907fd18907227cbe
      https://github.com/zanata/zanata-server/commit/38e8d7b62180d5fc3a8c3d8a907fd18907227cbe
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    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

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

Update clientserver tests to assertj


  Commit: 473dee0abd699bc47465131dc88d0ea0206d0ee2
      https://github.com/zanata/zanata-server/commit/473dee0abd699bc47465131dc88d0ea0206d0ee2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

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

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


  Commit: fc476fe9dcdffda6c2f8fb936af8576198d12f28
      https://github.com/zanata/zanata-server/commit/fc476fe9dcdffda6c2f8fb936af8576198d12f28
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

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

  Log Message:
  -----------
  Remove some unused messages


  Commit: 7493d20825ac53c7ce26786c95e14cfe53fd73d7
      https://github.com/zanata/zanata-server/commit/7493d20825ac53c7ce26786c95e14cfe53fd73d7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

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

  Log Message:
  -----------
  Fix property key


  Commit: d4c0ab8fa1dd11ce74a90afa7adc345d1827b02f
      https://github.com/zanata/zanata-server/commit/d4c0ab8fa1dd11ce74a90afa7adc345d1827b02f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Alias zanataMessages to messages; implement Map


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.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

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

Update concurrent edit tests to assertj


  Commit: 52452fcda829dfe247502a87b7f74489e75a4efd
      https://github.com/zanata/zanata-server/commit/52452fcda829dfe247502a87b7f74489e75a4efd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    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

  Log Message:
  -----------
  Merge pull request #509 from zanata/assertj-editor-tests

Replace hamcrest with assertj, annotate and clean up


  Commit: 0a8bbae3444f1f512f0745b802ad731c43aeafc7
      https://github.com/zanata/zanata-server/commit/0a8bbae3444f1f512f0745b802ad731c43aeafc7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #512 from zanata/assertj-misc-tests

Update misc tests to assertj and annotate Feature


  Commit: 38b4dd38b255185891a5959ef7a8226dbf5ac427
      https://github.com/zanata/zanata-server/commit/38b4dd38b255185891a5959ef7a8226dbf5ac427
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.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/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Replace EL in messages.properties with positional parameters

Also switch ZanataMessages from Seam EL interpolation to
using java.text.MessageFormat.


  Commit: f3a89e156895548c59428003f43b773e4ba512ac
      https://github.com/zanata/zanata-server/commit/f3a89e156895548c59428003f43b773e4ba512ac
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    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/projects/projectsettings/ProjectPermissionsTab.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

  Log Message:
  -----------
  Merge pull request #513 from zanata/assertj-project-tests

Update to assertj and fix project tests


  Commit: ded5931dfb27026f7c57d5488c1cc064d1db557f
      https://github.com/zanata/zanata-server/commit/ded5931dfb27026f7c57d5488c1cc064d1db557f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #521 from zanata/rhbz1114421

rhbz1114421 - able to test reset password


  Commit: 8a853f857180b709e6ae5434506168e8c327aee5
      https://github.com/zanata/zanata-server/commit/8a853f857180b709e6ae5434506168e8c327aee5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  Security tests assertj update and add Feature annotation

Also change the Ignore on reset password and improve formatting.


  Commit: 783870af1d332a035522407e2a50ac1befed07ed
      https://github.com/zanata/zanata-server/commit/783870af1d332a035522407e2a50ac1befed07ed
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Rename security test, enable resetPasswordSuccessful

'Full' is misleading.
Remove the ignore from resetPasswordSuccessful, as Huang's
earlier commit has fixed the database cleanup.


  Commit: 5c8b7619e78f2ef63aa405e5c24901cb4a6b42c3
      https://github.com/zanata/zanata-server/commit/5c8b7619e78f2ef63aa405e5c24901cb4a6b42c3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #518 from zanata/assertj-security-tests

Assertj security tests


  Commit: 59f803e0ca6eac01304d1788c622f35144cbb5a9
      https://github.com/zanata/zanata-server/commit/59f803e0ca6eac01304d1788c622f35144cbb5a9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Move zanataMessages alias into ZanataMessages.Factory


  Commit: 60e630b41d7ef7a9a5be08c7b3086f6b6173aa2b
      https://github.com/zanata/zanata-server/commit/60e630b41d7ef7a9a5be08c7b3086f6b6173aa2b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/SendEmailAction.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/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    R zanata-war/src/main/resources/messages_bg.properties
    R zanata-war/src/main/resources/messages_de.properties
    R zanata-war/src/main/resources/messages_en_GB.properties
    R zanata-war/src/main/resources/messages_fr.properties
    R zanata-war/src/main/resources/messages_gu.properties
    R zanata-war/src/main/resources/messages_it.properties
    R zanata-war/src/main/resources/messages_ja.properties
    R zanata-war/src/main/resources/messages_ko.properties
    R zanata-war/src/main/resources/messages_tr.properties
    R zanata-war/src/main/resources/messages_uk.properties
    R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.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/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.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/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.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/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.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

  Log Message:
  -----------
  Rename ZanataMessages to Messages, component name "msgs"


  Commit: 486039396902d667cea240a397796d536a7cce78
      https://github.com/zanata/zanata-server/commit/486039396902d667cea240a397796d536a7cce78
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

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

  Log Message:
  -----------
  Update javadoc for Messages


  Commit: 65490293180ead0d048590b8041a605d979cef0d
      https://github.com/zanata/zanata-server/commit/65490293180ead0d048590b8041a605d979cef0d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

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

  Log Message:
  -----------
  disable enter key in user management screen


  Commit: 64af89c5dbbbf88f12b62604578c5239af67fa0e
      https://github.com/zanata/zanata-server/commit/64af89c5dbbbf88f12b62604578c5239af67fa0e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-04 (Fri, 04 Jul 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/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Slightly change the wording on the signup/login pages, add tests


  Commit: cdff5422ffcb291689ea1ef79e01c1db80417e5b
      https://github.com/zanata/zanata-server/commit/cdff5422ffcb291689ea1ef79e01c1db80417e5b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/SendEmailAction.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/VersionGroupJoinAction.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/NotDuplicateEmail.java
    A zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/messages_bg.properties
    R zanata-war/src/main/resources/messages_de.properties
    R zanata-war/src/main/resources/messages_en_GB.properties
    R zanata-war/src/main/resources/messages_fr.properties
    R zanata-war/src/main/resources/messages_gu.properties
    R zanata-war/src/main/resources/messages_it.properties
    R zanata-war/src/main/resources/messages_ja.properties
    R zanata-war/src/main/resources/messages_ko.properties
    R zanata-war/src/main/resources/messages_tr.properties
    R zanata-war/src/main/resources/messages_uk.properties
    R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.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/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.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/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.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/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.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/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

  Log Message:
  -----------
  Merge pull request #517 from zanata/zanata-messages

Zanata messages


  Commit: 7c37e0e25afefc6aeb1f1d327327083d48499da3
      https://github.com/zanata/zanata-server/commit/7c37e0e25afefc6aeb1f1d327327083d48499da3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #523 from zanata/rhbz991259

:+1: Verified


  Commit: d530f7a58dc1465ce57db32c593ebdf2848423f0
      https://github.com/zanata/zanata-server/commit/d530f7a58dc1465ce57db32c593ebdf2848423f0
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.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/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Add new and cleanup existing Admin tests

- Covert to assertj
- Clean up existing tests
- Make edit homepage test work
- Add new tests
- Add Feature annotations
- Move chunky repeated text to the test file generator


  Commit: 9d8771477926a98c32de2c6c49875199045d347b
      https://github.com/zanata/zanata-server/commit/9d8771477926a98c32de2c6c49875199045d347b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

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

  Log Message:
  -----------
  Update plugins for Java 1.7 compatibility


  Commit: 23afeba571099a11d1ffa01e6245906447358fa8
      https://github.com/zanata/zanata-server/commit/23afeba571099a11d1ffa01e6245906447358fa8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #528 from zanata/java_1_7

Update plugins for Java 1.7 compatibility


  Commit: 7370e162348d6d2da47a95b710427ea56b444c97
      https://github.com/zanata/zanata-server/commit/7370e162348d6d2da47a95b710427ea56b444c97
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 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/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.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/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.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
    A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    R 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/workflow/ClientWorkFlow.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/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/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/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.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
    R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.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
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
    A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    R 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
    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
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/SendEmailAction.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/VersionGroupJoinAction.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/NotDuplicateEmail.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.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
    A zanata-war/src/main/java/org/zanata/dao/NativeQuery.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/i18n/Messages.java
    R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    R zanata-war/src/main/java/org/zanata/util/ZanataMessages.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/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.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
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/messages_bg.properties
    R zanata-war/src/main/resources/messages_de.properties
    R zanata-war/src/main/resources/messages_en_GB.properties
    R zanata-war/src/main/resources/messages_fr.properties
    R zanata-war/src/main/resources/messages_gu.properties
    R zanata-war/src/main/resources/messages_it.properties
    R zanata-war/src/main/resources/messages_ja.properties
    R zanata-war/src/main/resources/messages_ko.properties
    R zanata-war/src/main/resources/messages_tr.properties
    R zanata-war/src/main/resources/messages_uk.properties
    R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    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/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.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/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.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-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.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/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.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/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.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/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/arquillian/Deployments.java


  Commit: c3e2cb663e76b3141d30f925f581e0fb13591a11
      https://github.com/zanata/zanata-server/commit/c3e2cb663e76b3141d30f925f581e0fb13591a11
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  use angular.js to generate feature inventory


  Commit: 3a4e00f6db9cc44b475b1e60726b3949c90660b8
      https://github.com/zanata/zanata-server/commit/3a4e00f6db9cc44b475b1e60726b3949c90660b8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

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


  Commit: dba627eed5539c1d8b7b89b0862885eb0235ce28
      https://github.com/zanata/zanata-server/commit/dba627eed5539c1d8b7b89b0862885eb0235ce28
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  rbhz1116688 - clear HRoleAssignmentRule table after test


  Commit: 872843bd379bdd0c8a01fa33397c2307788ce59d
      https://github.com/zanata/zanata-server/commit/872843bd379bdd0c8a01fa33397c2307788ce59d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-09 (Wed, 09 Jul 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java

  Log Message:
  -----------
  add copyright and remove setter/getter


  Commit: cc26a11fd1fa653f48df04ff00652bb0a437869a
      https://github.com/zanata/zanata-server/commit/cc26a11fd1fa653f48df04ff00652bb0a437869a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-09 (Wed, 09 Jul 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html

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

Fix test after PR #517


  Commit: 3fd0239a9d48c0c8e37c7e1fae35d3f06612daef
      https://github.com/zanata/zanata-server/commit/3fd0239a9d48c0c8e37c7e1fae35d3f06612daef
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-09 (Wed, 09 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java

  Log Message:
  -----------
  Remove dependency on Collections.emptyEnumeration() from Java 1.7


  Commit: 850c5691e00d98f39121d18901d42a72e9332c49
      https://github.com/zanata/zanata-server/commit/850c5691e00d98f39121d18901d42a72e9332c49
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-10 (Thu, 10 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/feature-inventory/app.js
    M functional-test/src/test/resources/feature-inventory/controllers.js
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  fix issue in feature detail controller


  Commit: 49fbfd0a0ca836013f7b3a74a46c030de329adc3
      https://github.com/zanata/zanata-server/commit/49fbfd0a0ca836013f7b3a74a46c030de329adc3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-10 (Thu, 10 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java

  Log Message:
  -----------
  Merge pull request #532 from zanata/java16enum

Remove dependency on Collections.emptyEnumeration() from Java 1.7


  Commit: 71bb98f784271c8716495952ef58d27e33cbe523
      https://github.com/zanata/zanata-server/commit/71bb98f784271c8716495952ef58d27e33cbe523
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/feature-inventory/app.js
    M functional-test/src/test/resources/feature-inventory/controllers.js
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

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

fix issue in feature detail controller


  Commit: 4f02f0a285624802e82b40c2f6e24053b0008efc
      https://github.com/zanata/zanata-server/commit/4f02f0a285624802e82b40c2f6e24053b0008efc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-11 (Fri, 11 Jul 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/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #524 from zanata/add-some-register-tests

Slightly change the wording on the signup/login pages, add tests


  Commit: 3ba2ce8c2f617971e0a3a15b5b51ca4bba67966c
      https://github.com/zanata/zanata-server/commit/3ba2ce8c2f617971e0a3a15b5b51ca4bba67966c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java

  Log Message:
  -----------
  rhbz1113843 - Fix permission evaluation when dealing with multiple targets.


  Commit: 013b2ae90c87c42cc67766f26d8ce3610b2a8070
      https://github.com/zanata/zanata-server/commit/013b2ae90c87c42cc67766f26d8ce3610b2a8070
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    A functional-test/src/test/resources/test-tmx.xml

  Log Message:
  -----------
  Move tmx test text chunk to file

Also clean up some review comments


  Commit: 1a10a894259ff7c2caa5975c7e8e0ff1e24c0632
      https://github.com/zanata/zanata-server/commit/1a10a894259ff7c2caa5975c7e8e0ff1e24c0632
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.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/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/resources/test-tmx.xml

  Log Message:
  -----------
  Merge pull request #526 from zanata/assertj-admin-tests

Add new and cleanup existing Admin tests


  Commit: 19bd165debf3e4849b141d7deb5b896d24ec7ac6
      https://github.com/zanata/zanata-server/commit/19bd165debf3e4849b141d7deb5b896d24ec7ac6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
	zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
	zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
	zanata-war/src/main/resources/messages_en_GB.properties
	zanata-war/src/main/resources/messages_ja.properties
	zanata-war/src/main/resources/messages_uk.properties
	zanata-war/src/main/resources/messages_zh_TW_Hant.properties
	zanata-war/src/main/webapp/WEB-INF/pages.xml
	zanata-war/src/main/webapp/admin/processmanager.xhtml


  Commit: 96aec51a495c81ecb7ee59a937c980f1d04a39d4
      https://github.com/zanata/zanata-server/commit/96aec51a495c81ecb7ee59a937c980f1d04a39d4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

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

  Log Message:
  -----------
  rhbz1122373 Fix message format parameter


  Commit: 20a51e27a02df0a313b3fce39383a49aada0ee00
      https://github.com/zanata/zanata-server/commit/20a51e27a02df0a313b3fce39383a49aada0ee00
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #538 from zanata/rhbz1122373

rhbz1122373 Fix message format parameter


  Commit: dee14288ab106ab212af7865077a0f2ba3b42d36
      https://github.com/zanata/zanata-server/commit/dee14288ab106ab212af7865077a0f2ba3b42d36
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    A zanata-war/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/email/EmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    A zanata-war/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/activation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_validation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/password_reset.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/username_changed.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A zanata-war/src/test/java/org/zanata/email/EmailBuilderITCase.java
    A zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    A zanata-war/src/test/java/org/zanata/email/EmailUtilTest.java

  Log Message:
  -----------
  Use Velocity to generate email

https://github.com/zanata/zanata-server/pull/534

Squashed commit of the following:

commit cd0fbee650b4e92b9ccd795a9410259e87d8d2ca
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jul 22 14:14:35 2014 +1000

    Update unit test: HTML should appear after text

commit 58f956aa565815b47655213441f02df76a0070a9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:10:50 2014 +1000

    Add @AutoCreate to injected components

commit d035448add298583965b7bb2abf87f6d94147427
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:08:27 2014 +1000

    Construct Reply-To correctly

commit 8ee323c2b561b415b8898e5e8a04457adecb90db
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 17:58:24 2014 +1000

    Add HTML mail part after text; produce text version of the HTML body

commit bae62c5a5f417600bc2bd0718f34649caceb0762
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 17:13:36 2014 +1000

    Refactor email-handling code and fix injection of mailSession

    Eliminate redundant template "email_activation.vm".
    Rename EmailUtil -> Addresses and use it more.
    Rename EmailBuilderStrategy -> EmailStrategy.
    Move all EmailStrategy classes to top-level under org.zanata.email.
    Ensure that all emails go through EmailService and get FacesMessages
       from Msgs so that they can be localised.

commit 8365f539ea292770257821f2953785c268199365
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 12:22:28 2014 +1000

    Make EmailBuilder into a component

commit 6f9ec47af5e5227fb3a68962ea97e34f54063b73
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 11 12:46:36 2014 +1000

    Use Velocity to generate email


  Commit: e0afdde0dd9478f625c312600b793096e0408690
      https://github.com/zanata/zanata-server/commit/e0afdde0dd9478f625c312600b793096e0408690
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Merge pull request #478 from zanata/sec-functions

:+1:


  Commit: e65e55b0c8068f4713656c14c672bff4ce5f1ea5
      https://github.com/zanata/zanata-server/commit/e65e55b0c8068f4713656c14c672bff4ce5f1ea5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    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/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Rhbz973509 Indicate periods are acceptable for ids


  Commit: 4a63db5fa579ebb171e39d82929e4a6d26fb349e
      https://github.com/zanata/zanata-server/commit/4a63db5fa579ebb171e39d82929e4a6d26fb349e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java

  Log Message:
  -----------
  avoid stack overflow error when taking screenshot throws exception


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  fix: remove reference to drools rules security resolver after the security change


  Commit: 2e0439b7b61a54e2f87747dc746e647c301defd2
      https://github.com/zanata/zanata-server/commit/2e0439b7b61a54e2f87747dc746e647c301defd2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java

  Log Message:
  -----------
  Merge pull request #542 from zanata/stackoverflow

avoid stack overflow error when taking screenshot throws exception


  Commit: 5d9bc0ffdc4f6b4a777de6fc8701e7894741a05b
      https://github.com/zanata/zanata-server/commit/5d9bc0ffdc4f6b4a777de6fc8701e7894741a05b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/test-tmx.xml
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/glossary/view.xhtml

  Log Message:
  -----------
  Update glossary view: https://github.com/zanata/zanata-server/pull/537


  Commit: 05e31c2fbb21a5680694748ffa53b40e87187f8e
      https://github.com/zanata/zanata-server/commit/05e31c2fbb21a5680694748ffa53b40e87187f8e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/jquery.typing-0.2.0.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

  Log Message:
  -----------
  Usability Fixes: https://github.com/zanata/zanata-server/pull/522

Squashed commit of the following:

commit 4d93b1161d2f564ce425a085fd14ad1d0336308e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Jul 23 15:06:25 2014 +1000

    More usability fixes.

    - Make autocompletes only fire when there is a change to the search text (avoid ctrl keys), and after the user has stopped typing.
    - Search for maintainers is now case insensitive.
    - Add a loader when adding maintainers (currently only at the version group page).

commit bd243870f70725434cbe3f6c039a57d84d11450c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Jul 14 15:15:19 2014 +1000

    Revert change for version group page.

commit d4d584282f3ab5dd3fab12b98ba592dcd9014002
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 3 15:46:25 2014 +1000

    Refactor test to avoid random timing-related failures.

commit b048ff49f5184738aa91d442733d24f3398a3add
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 3 09:34:51 2014 +1000

    Make the requests from list filters have a short (500ms) delay before being sent to the server.

    This means less requests sent to the server.
    This generates some unnecessary warning messages on the logs. See the following for more details:
    https://issues.jboss.org/browse/RF-11737
    https://issues.jboss.org/browse/RF-11941

commit 48b6f98d697262c0dba50e87fb1a4f4d59bf34aa
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jul 1 16:51:40 2014 +1000

    Usability fixes.

    Includes changes to the autocomplete controller so that it shows ajax indicators as well as resetting to its initial state when it needs to.
    When Escape key is hit on the autocomplete, the result list is hidden and the whole text is selected.
    When searching for projects, the presence of spaces no longer omits results.
    Remove some default Seam messages that conflict with application defined messages.
    Version Group page changes:
    Refactor the page so that when adding or removing versions, languages and maintainers, there are ajax indicators for these operations.
    Make sure the loaded tab (according to the URL) is displayed before sending off the initial ajax requests.


  Commit: 87695aa7b0aaa7bd7b66a38d9dec329c6a42e849
      https://github.com/zanata/zanata-server/commit/87695aa7b0aaa7bd7b66a38d9dec329c6a42e849
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/testing/TestTransformer.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 2352b6349e9d96c51b610db5758c9c6d0094f2dc
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jul 30 09:10:54 2014 +1000

    fix classloading issue

commit c1b0728b7310c6ffd24c1a0c75335b619405958d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 29 11:21:44 2014 +1000

    rhbz1011310 - provide better error message when email service is down


  Commit: 0a7b0fbd0b4b5f1a607dccb86df3a037594d5df2
      https://github.com/zanata/zanata-server/commit/0a7b0fbd0b4b5f1a607dccb86df3a037594d5df2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  Merge pull request #543 from zanata/fix-security

fix: remove reference to drools rules security resolver after the security change


  Commit: 08f93c993b72c00ef6660f3e6c0a775a42c76252
      https://github.com/zanata/zanata-server/commit/08f93c993b72c00ef6660f3e6c0a775a42c76252
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

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

  Log Message:
  -----------
  Prevent NullPointerException from account in SecurityFunctions


  Commit: 7da217e3b365ef954abbffb0aefb0712c4a0c642
      https://github.com/zanata/zanata-server/commit/7da217e3b365ef954abbffb0aefb0712c4a0c642
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #546 from zanata/avoid-null-account

Avoid NullPointerExceptions for null accounts in SecurityFunctions


  Commit: 0ae0075ef518fe68b966e459765f6ca929f94470
      https://github.com/zanata/zanata-server/commit/0ae0075ef518fe68b966e459765f6ca929f94470
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

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

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml


  Commit: 2428da76af9f7e12e8c7f8f625b3a95cea341851
      https://github.com/zanata/zanata-server/commit/2428da76af9f7e12e8c7f8f625b3a95cea341851
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    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/GlossaryDetailsPresenter.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/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/DelegatingDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DialogBoxCloseButton.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    A zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Add gwtmockito; remove gwt-dev

Replace com.google.gwt.core.client.GWT with com.google.gwt.core.shared.GWT.
Introduce gwtmockito for tests which need to create ClickEvents:
   https://groups.google.com/d/msg/google-web-toolkit/H0Blv3C_fns/35PqYGlGvQ8J
Clean up enforcer exceptions.


  Commit: 0c68ef2dc1aed0bde659630fbdc43465b0bea256
      https://github.com/zanata/zanata-server/commit/0c68ef2dc1aed0bde659630fbdc43465b0bea256
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

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

  Log Message:
  -----------
  Configure maven-duplicate-finder-plugin; clean up some duplicate deps


  Commit: a3c4fddfad05f1d6f0207f0753acec397e7420c9
      https://github.com/zanata/zanata-server/commit/a3c4fddfad05f1d6f0207f0753acec397e7420c9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add javamail exception for maven-duplicate-finder-plugin


  Commit: fab6eca94217780724eac8c09a79d485cde2abdb
      https://github.com/zanata/zanata-server/commit/fab6eca94217780724eac8c09a79d485cde2abdb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Remove banned dependency


  Commit: 2e4c78db1c9282fa2dcf8409edd4b91a055a3139
      https://github.com/zanata/zanata-server/commit/2e4c78db1c9282fa2dcf8409edd4b91a055a3139
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

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

  Log Message:
  -----------
  Remove banDuplicateClasses enforcer

Replaced by maven-duplicate-finder-plugin.  See
   https://github.com/zanata/zanata-parent/pull/28 and
   https://github.com/zanata/zanata-parent/commit/04a7b8d


  Commit: d82b11133812eae3ed1dc7eda454e8bb2472be93
      https://github.com/zanata/zanata-server/commit/d82b11133812eae3ed1dc7eda454e8bb2472be93
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

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

  Log Message:
  -----------
  Reduce duplicate code in ServerConfigurationBean

commit 30b60c4a7f2e1b77556680270c5e3974f760244a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 5 11:14:21 2014 +1000

    Ensure excess accessors are not generated for ServerConfigurationBean

commit 21d10c5eb96337770cadfd73c60115209241413f
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 5 09:34:13 2014 +1000

    Refactor to remove code duplication from ServerConfigurationBean.


  Commit: 5f97d5e0e713dd510effcfd9c3eb83f96e07fd87
      https://github.com/zanata/zanata-server/commit/5f97d5e0e713dd510effcfd9c3eb83f96e07fd87
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

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

  Log Message:
  -----------
  Fix cancel copy translations mouseover hint


  Commit: b9ee41633e587c3bd85626fac70cb40f5e1c68d2
      https://github.com/zanata/zanata-server/commit/b9ee41633e587c3bd85626fac70cb40f5e1c68d2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

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

  Log Message:
  -----------
  Rhbz995904 Remove ellipsis on TM Origin when not necessary

Only add ellipsis on TM origins substring when length is
greater than 10 characters.


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

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

  Log Message:
  -----------
  create project REST service will fail on adding maintainer

- we flush early and that causes an update when adding the user as maintainer, which then failed on update permission check because he is not yet a maintainer


  Commit: 444bb3bdc7106b10fad8fc404af77a4a4b4ce049
      https://github.com/zanata/zanata-server/commit/444bb3bdc7106b10fad8fc404af77a4a4b4ce049
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

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

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


  Commit: 7c0ddda64cad7acc1097bf5f4d7854d3e51afd73
      https://github.com/zanata/zanata-server/commit/7c0ddda64cad7acc1097bf5f4d7854d3e51afd73
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update H2 version used for tests.


  Commit: 13992d6cd797d75c3fc4e5d976e86014ba78f5fc
      https://github.com/zanata/zanata-server/commit/13992d6cd797d75c3fc4e5d976e86014ba78f5fc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

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

  Log Message:
  -----------
  rhbz1110627 - add REST endpoint for project config


  Commit: 174e7f80061a69249b2d1abe03018560804374c1
      https://github.com/zanata/zanata-server/commit/174e7f80061a69249b2d1abe03018560804374c1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

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


  Commit: 9be4de81bcfb4f9738d3e73dab93085f20547286
      https://github.com/zanata/zanata-server/commit/9be4de81bcfb4f9738d3e73dab93085f20547286
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #520 from zanata/rhbz1110627-zanata-init

rhbz1110627 - add REST endpoint for project config


  Commit: 5b76932142d18da8ab16a5d4a08acbd58d72ed37
      https://github.com/zanata/zanata-server/commit/5b76932142d18da8ab16a5d4a08acbd58d72ed37
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    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/VersionDocumentsTab.java
    M 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/MultiFileUploadTest.java
    M 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/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 zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
    A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/README.md
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.min.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/README.md
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.xdr-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-process.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-validate.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.iframe-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/vendor/jquery.ui.widget.js
    A zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Merge branch multi-file-upload.

Adds multi-file upload dialog to version -> settings -> documents
tab allowing multiple files to be uploaded in a single operation.

Maximum files per upload can be configured in
administration -> server config.

Squashed commit of the following:

commit 607ca73925f7bd3b3bf1540f83c3de383d2c5acf
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 8 14:08:33 2014 +1000

    fix grammar and broken link output in multi-file upload

commit 3c1013d432f01e12155d880f614130a606739890
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 17:51:18 2014 +1000

    use canonical supported file types for project types

commit 23ee9cb16f957f47e5a9c3a066670824a04a896e
Merge: a6bb99c 9be4de8
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 17:49:59 2014 +1000

    Merge branch 'master' into multi-file-upload

commit a6bb99c385abde9d36cb4e85a17210f7e1904596
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 13:54:20 2014 +1000

    use proper formatting for multi-file-upload.xhtml

commit 9f098868d79a60ad344cb961cd72f319559a4dab
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 13:20:14 2014 +1000

    remove unused parts of jQuery File Upload library

commit d339f86ef38a168bf77b6535f54b5f0bcc43fbf9
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:59:35 2014 +1000

    remove unused parts of JavaScript Templates library

commit 51870f54df53bc51ab89f08191b947324a914f23
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:55:14 2014 +1000

    remove excess jquery import

commit dadbcabe2e066d4688dbe9df2238df23adccdb92
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:40:01 2014 +1000

    remove unused file

commit b4718fe362da0396cc9de88d314771c6e9c2d286
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:38:58 2014 +1000

    use Slf4j for logging in MultiFileUploadServlet

commit d79e64419e08f07e088f5fe48c32d38e954b3bd3
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:36:53 2014 +1000

    use DocumentType constant to compare types

commit 413f33307f5a8a361dab854e3c22d44d9509d197
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:28:30 2014 +1000

    Use static LocaleId field for en-US

commit 3d6ee66dc4dea788cb22d4ee84ce400a0b2f5c4c
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:23:36 2014 +1000

    indicate where inline templates are processed

commit a7c6f67393820fd760de96c1ff619c4233a8863f
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 6 14:29:36 2014 +1000

    add server config option for max files per upload

commit 1bc23580933ac4105701bee1ff45b03f1c84d487
Merge: ed23803 d82b111
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 6 12:35:58 2014 +1000

    Merge branch 'master' into multi-file-upload

commit ed23803361c13d28c3294673c5609768c1f90b6b
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 4 11:59:49 2014 +1000

    prevent invalid upload file extensions being seen as valid

commit fa8d238c76e6539f82849bb0921566e179b3cb7f
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 4 07:59:14 2014 +1000

    Use translatable strings for multi-file upload script.

    Strings are included in the DOM of the multi-file upload widget so they
    can be translated through the same mechanism as the other UI strings in
    JSF. The script looks up the list of strings in the DOM and populates
    the messages object.

commit c0773c82d75392e7fc94d38bf3574ae5dfbdaf05
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Aug 1 15:22:33 2014 +1000

    Fix document upload functional tests

commit 152acc670a67f9044e8af7883c670471a3fdd670
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 17:13:21 2014 +1000

    use translatable strings for multi-file-upload template

commit 99d41d6b3918cb476210ba9ee05c73f24df24df9
Merge: 276bc67 7da217e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 15:30:12 2014 +1000

    Merge branch 'master' into merge-multi-file-upload

commit 276bc67ef484dc06df96444bcd8ad372abbf6823
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 14:07:28 2014 +1000

    WIP: using localizable messages in multi file upload

commit 1306648616408eb1b65499ebf6e44076e571f170
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 11:07:21 2014 +1000

    fix compile errors caused by merge conflict resolution

commit 861de99121a5515eb7521722c76c7083e696f2cc
Merge: 0e66e8f 708a3a9
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 30 17:21:12 2014 +1000

    Merge branch 'multi-file-upload-tests' into merge-multi-file-upload

    Conflicts:
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
   Resolved all using --ours option (keeping version from master).
  Intend to manually apply necessary changes in these files in a subsequent commit,
  rather than risk overwriting the newer code.

commit 0e66e8fba241ab2d8b4a8b67ebeeecef3d82f325
Merge: 05e31c2 8b2bd46
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 30 16:42:19 2014 +1000

    Merge branch 'multi-file-upload' into merge-multi-file-upload

    Conflicts:
    	zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    had conflict where multi-file-upload element was added, same location
    had "messages" changed to "msgs". Kept chunk from multi-file-upload
    but changed "messages" in that chunk to "msgs".

commit 708a3a910d5beb56c3a35f396819eb46f93073b2
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Jun 27 13:51:19 2014 +1000

    Multiple file upload test

commit 8b2bd4615be9fd6782313e764ee0c1a6df52da09
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 28 12:23:45 2014 +1000

    Use format strings for UI text

    All strings for display are wrapped in i18n function.
    At the moment this only replaces placeholders since I have not provided
    a way to make translated strings available. The simplest approach I can
    think of to make translated strings available would be to output them as
    text in hidden DOM elements of the component, since that would allow
    translations to be handled through the existing page translation workflow.

commit 7370f5335025d8f5c5f19f4823a7d20bbe61a8aa
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Jun 27 00:24:10 2014 +1000

    Fix testing of uploading files

    Also remove a number of unnecessary steps in the upload tests.

commit a65b0d2418b1fb2438ce3f7913bfc4ad1e43f818
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 25 11:39:02 2014 +1000

    SQUASH some cleanup

commit dd25056f29a1f8bf4de39d3eda5c124ce9392d60
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 24 17:00:29 2014 +1000

    Needs Cleanup: WIP different upload stages being recorded, not used for count display yet

commit e8e054739036b4b75690f1764842cff80a7da998
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 15:23:10 2014 +1000

    make custom file parameters collapsed by default for multi-file upload

commit 7b38ddc62c9537cbe81cef4b1466ab35986ccc06
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 14:34:45 2014 +1000

    Add help for custom document parameters field in multi-file upload

commit db43a80276cf8a17188a1572179ed6cd5648611d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 10:54:42 2014 +1000

    hide advanced settings when multi-file-upload starts

commit f629abc459bcf194575727e06e224a5929e631c8
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 22 17:33:55 2014 +1000

    update error message for users with multiple concurrent uploads

commit b11d4fda15f3e3f8e82746bd753ea1444463e2db
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 22 17:31:43 2014 +1000

    Ensure multi-file-upload dialog always responds to finished uploads

commit 78d45e844976d09405bc16ac62ac7d3a37695353
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 12:37:38 2014 +1000

    Use change in filename emphasis to indicate which files have uploaded.

    This replaces the green circle icon that was indicating upload completion
    previously.

commit caf560632fb7b4e445518bfdb8091c832a27fa77
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 12:35:59 2014 +1000

    Ensure loader reserves space in multi-file upload dialog.

    This will prevent layout changes for long filenames during upload,
    but only when the .is-reserve-space css class is implemented in the
    assets.

commit 4980b1ed86f949da72c79d1edc5c978873c06672
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 11:41:43 2014 +1000

    Ensure uploading file items display with consistent height.

    During multi-file upload, file items were changing size slightly
    when they finished uploading, due to the loader widget changing the
    height. This is a workaround until the loader widget is updated to
    work better in inline mode - it just adds a hidden loader to the
    uploaded template to force it to the same height.

commit cddd1bd3665b36063e3e4fe13175af22d41e6359
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 11:40:04 2014 +1000

    Warn user when closing page during multiple file upload

    This adds a modal dialog when a user is currently uploading source
    files and they attempt to close or navigate away from the page.

commit e39be2a7148219c70ee298e4ef4eedddfcf18674
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 19:32:21 2014 +1000

    Add confirmation to all operations that cancel an upload.

    Makes sure the event 'hide.zanata.modal' is triggered in all cases that
    close the modal, then add the check to that event.
    Also incidentally fixed some cases in which the modal could be closed
    without refreshing the document list by attaching an event on
    'hide.zanata.modal' to refresh the statistics.

commit b7e6606cc5c1d14cae574936561057cdf98f9cce
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 14:09:56 2014 +1000

    Prevent file upload progress bar incrementing before files are uploaded.

    This is just a workaround that delays the increment until the next
    progress event, which seems sufficient without a complete overhaul
    of the progress system (which seems to have something really wrong with it).

commit 27e7359daebeafe33d986f563922a8dac150eb45
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 14:09:44 2014 +1000

    clean up leftover comment

commit 5004bd4302106063812f4905760d9212ac2075e0
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 13:01:31 2014 +1000

    User throbber instead of progress bar for uploading files.

    Individual file items in multi-file upload dialog show a throbber
    when they are uploading. The overall progress for all the files
    still uses a progress bar.

commit 92d587a812b740caf4ebff5182555ab15e63e889
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 14:08:26 2014 +1000

    ensure file count indicator resets when multi file upload form resets

commit edf2f3d926b52340b63862a5f7ad3669fda9416a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 13:43:01 2014 +1000

    clear errors when retrying upload of multiple files

commit 43822c0525936fcfb77e516627d0c057797ce73d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 13:42:29 2014 +1000

    Clean up fileupload ui code

commit 2613787fb772f3a7e889b8cb5a413cf83c594f4f
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 7 16:02:56 2014 +1000

    SPLIT: check logged in and not already uploading before initiating upload
   Upload button now changes to "Try Again" if user is not logged in or has an upload
  going in another tab/window/computer.
   Still needs to display errors upon failure, and the code is messy,
  but it works so I'm making a commit in case I break it.

    Squashed commits:

    SQUASH clean up code for GET on MultiFileUploadServlet

    SQUASH clean up code for POST on MultiFileUploadServlet

    Display appropriate error when transaction times out for uploaded file persistence.

    Show appropriate error when concurrent uploads reach the database.

    log id properly for a user who is already uploading

    change error text for timed-out file upload

    SQUASH update error message in MultiFileUploadServlet

commit df239c4a5eab567ee628242895b0cb4a249ffe8e
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 2 11:42:09 2014 +1000

    Prevent opening of file select dialog when clicking outside the intended click target.

    The dialog was opening when clicking anywhere in a region to the right of and below
    the "browse files" text that is the intended click target. This change limits the
    target to just the "browse files" text.
    Wrapping of the "browse files" text is prevented since the transparent file upload
    button must overlay all of the text for the dialog to open properly (plus it looks
    better with the whole link on the next line than split across lines).

commit 5a0828a74a36fbe0d10dd75cc9f450bf4b0d138b
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 18:17:47 2014 +1000

    Limit file uploads to 100 files at a time.
   This adds a hard-coded limit of 100 files, with the intention to replace the limit with a
  configurable value.

commit 3231d731793aa727285d6cfb97f89104219e975a
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 15:40:16 2014 +1000

    Remove cancel button from files while upload is in progress.

commit bb694a125d56113f992c9f8d421b9c2e2ecb1a4f
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 12:58:27 2014 +1000

    Prevent advanced settings being retained after closing upload dialog.
   Prevents both file path and custom upload parameters from remaining
  when the multi-file-upload dialog is closed and re-opened.

commit 0f977a13487cd668bb1af1c0de2e82af921e4e58
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 12:16:47 2014 +1000

    Make 'browse files' link vertically centred.

commit 749ad6ed977e7d3cc0b5382b356f74e3f2deda91
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 12:46:53 2014 +1000

    Update file upload test to work with new component.

commit 4779e62d61ca6d372504424c3e59518bfe989795
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 11:20:00 2014 +1000

    Remove org.json as a used dependency for maven-dependency-plugin

commit 5be8be5b6b1e7e96ec0f738eb729639568613bc5
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 10:34:21 2014 +1000

    Remove source language selector from multi file upload dialog.

      Source language is ignored by the server at the moment, so there is
      no value in having a user select it.

commit f306a8c056d184b4a933fe1a52ccbaab327ea600
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 10:26:27 2014 +1000

    Use multi-file upload component on settings tab.

commit a1e784e47b3beb4ee34bb56a5e5cdd08fd64afe4
Merge: 308bfc3 abab959
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 19 13:01:26 2014 +1000

    Merge branch 'master' into multi-file-upload

    Conflicts:
    	zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
   A servlet mapping is added at the same position on each branch.
  Merge keeps both mappings.

commit 308bfc35bd905ad6820c01b0d75580405c70bf9e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Tue May 20 09:55:02 2014 +1000

    WIP: getting json libraries working properly

commit 361cc8c962dcddff13dcd2174a10ac55d2ed19ad
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu May 1 10:54:14 2014 +1000

    show intelligible error when uploading multiple files after session timeout

commit aad070027301c34ea19f87fd21ccfb841590d68f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu May 1 10:52:13 2014 +1000

    improve inline file upload error style

commit a2cec76491d9b3623cd09157c7d80532bff80683
Author: David Mason <dr.d.mason at gmail.com>
Date:   Wed Apr 30 15:55:57 2014 +1000

    show uploaded documents when multi-file-upload dialog is closed

commit dbad9ba98cc655a0fd5cad8ca0d06cdc7362acf7
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Apr 3 08:42:28 2014 +1000

    SQUASH add style classes to multi file upload widget

commit 93ca7569adf4e0d18d6c4738a5fee0e099ee14b4
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Apr 3 08:42:00 2014 +1000

    SQUASH hide files panel when no files are shown

commit 7f34125fe2bffbbd5ab0d8f2c4ecf4637ecf07c3
Author: David Mason <dr.d.mason at gmail.com>
Date:   Wed Apr 2 09:56:08 2014 +1000

    show and hide portions of the form when upload is not supported

commit e757dee5f3538efc60eb8a96285b8215514ee334
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 31 13:58:49 2014 +1000

    ensure that .pot extensions are handled properly in uploaded source files.

commit 0e62035fb75f2a9338bc2fb155d33dd5d0af1716
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 11:53:02 2014 +1000

    add 'accepted' attribute to multi-file-upload widget

commit 60986fef16d811122d4dd13fc8617b45509c2958
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 11:46:07 2014 +1000

    limit individual file size to 200MB

commit 3abb78bcc52f6575c73277d09015add0a3aaa775
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 15:29:17 2014 +1000

    Various display behaviour tweaks to file upload dialog.
   - when there is an error adding a file, just show an error and do not add it
  - show number of queued and uploading files
  - change drop zone style when files are dragged over it
  - reset dialog when it is reopened
  - close dialog when any of the cancel buttons are pressed
  - disable adding more files when upload has started

commit 7b6ca7cf07328abd348f07eb1186eed61b6614bd
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Mar 20 14:24:37 2014 +1000

    prepend modal dialogs to body to prevent automatic cloning

commit 40cbd4704472265498a6f19c41e130264d4e350f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 17 09:44:12 2014 +1000

    limit uploads to accepted file types

commit 816627108433efd44ce4bfe8c27934bea9ece856
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:11:56 2014 +1000

    create multi file upload widget

commit 19d99e4efcdbf3cdef5ad1c29ac7d6b5bee0deb8
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 21:36:38 2014 +1000

    strip CDATA from template strings

commit d8bcac50beef58b29dd2e6e0e640e2f559c3933e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 21:43:15 2014 +1000

    modify main script for fileupload to work with multi-file-upload widget

commit 9a25e0bcad4546ccf38d3aa78ebb30391d4bb86e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 23:38:44 2014 +1000

    add javascript templates library

commit 5c1271daec3aae626f40013eb319f2e8916d520e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:10:35 2014 +1000

    add jquery file upload library

commit e9fc692195fd9b6ad0d00ee1291e8bf3e4f360ae
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:06:53 2014 +1000

    add upload servlet for multiple files

commit 083ce607eca235845bf95cc1259be28426b5454f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 17 18:15:40 2014 +1000

    Add method to allow uploads without provided hash


  Commit: 42e9f0e6a9ddc4a613b1a47655a39919f6c80734
      https://github.com/zanata/zanata-server/commit/42e9f0e6a9ddc4a613b1a47655a39919f6c80734
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #540 from zanata/rhbz995904

Rhbz995904 Remove ellipsis on TM Origin when not necessary


  Commit: 70ec903869c7842e19be81708b98fbdd8ea1cb7d
      https://github.com/zanata/zanata-server/commit/70ec903869c7842e19be81708b98fbdd8ea1cb7d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    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/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Merge pull request #541 from zanata/periods-are-valid-id

Rhbz973509 Indicate periods are acceptable for ids


  Commit: e9f6e66c67672bfea885a203df08c20919bb3e81
      https://github.com/zanata/zanata-server/commit/e9f6e66c67672bfea885a203df08c20919bb3e81
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.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/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    A zanata-model/src/main/java/org/zanata/util/JPACopier.java
    A zanata-model/src/test/java/org/zanata/util/JPACopierTest.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/CopyVersionManager.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/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
    A zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    A zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    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/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-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/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Copy version feature: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
Squashed commit of the following:

commit caf208c41090e261c0a4c73042c77511d51a4a0c
Merge: 55e8dd8 70ec903
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 12 07:53:09 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 55e8dd8748384aacbafbfb7ee6bde7cade1a00a2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 15:51:50 2014 +1000

    reduce number of batches for document

commit 805c23a8c9d21ed97dac0fbe2c28671c451d4752
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 15:47:32 2014 +1000

    Change order of rerender after copy version cancel

commit 171d0485b723c6c8db91c1148ce9385711e868f2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 13:17:01 2014 +1000

    clear versionHome bean after cancel copy version

commit 8b3e50d8465f2a00ad4b2f4d68bd3260276d16c2
Merge: e05ef92 5b76932
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 10:57:13 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/VersionHome.java

commit e05ef9230162c6c37ecf6904d5dc3e01663b8296
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 10:34:18 2014 +1000

    Implement confirmation message when cancel version copy

commit 01b9df829c6102b825bd6a5c768c2db71338f626
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 12:38:52 2014 +1000

    Fix version status while copying

commit 4a853b74a5948460d940e48ffc6b418b1da9766e
Merge: 3992f1b 9be4de8
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 07:25:22 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 3992f1bc77aa095f33d2eda760111077451cc6c1
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 07:24:49 2014 +1000

    Fix returned percentage for progressBar

commit 80de2ea2ddbac97222e8e0e65fa9ecd6f27e5a2d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 14:43:51 2014 +1000

    Implement copy version option from version page, fix url rewrite for copy version

commit 0e301de917342a226c2fc39c8e8c4e4ed6224bfb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 08:16:52 2014 +1000

    Fix version status in version page after copy

commit b78fda237235f523ea7cc31fb72fbc1a1900da53
Merge: 21a2817 444bb3b
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 08:07:34 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 21a2817429922f163e25d714c9d6f61aba618fc7
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Aug 6 13:00:40 2014 +1000

    Fix copy version cancel button

commit 0ade0d101e858f4a2d3abbc4f03e90aaef742328
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 15:35:15 2014 +1000

    WIP: fixing onComplete and onCancel for copy version

commit c0b49a9661f83454fb91bf9f2cdb853a9c4b04c6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 12:49:45 2014 +1000

    Fix cancel copy version button

commit 3fb30fdd60bb469543bceeb702175d1bfd09a9b6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 12:10:13 2014 +1000

    Fix version status after cancel copy

commit b44c14a699c91230f9be9c49acf2c6d93fa23ac9
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 10:36:19 2014 +1000

    Fix copy target history

commit 372da045d9efffeaa079a1c53f43e2fc0e543147
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 4 15:26:05 2014 +1000

    fix invalid slug when copy version, progressBar check on optional method onComplete

commit 07511aa57e11dc90ca9efca18545be6b822118c3
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 4 13:03:53 2014 +1000

    Disable copy from obsolete version

commit 6b74db58bc25728e2a67939238179534cabdb948
Merge: 36a3125 0a7b0fb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 31 10:44:03 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 36a31254212291671806f3454291d6411fd5b578
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 31 09:47:46 2014 +1000

    Add comments, refactor test

commit 0522a6f7aa4eb1991a7d089d130d3254fd466907
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 30 15:27:40 2014 +1000

    Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
    Squashed commit of the following:

    commit ca25839b932ee9ee962099c47b8582f2a6731b41
    Merge: 30a2fbe 87695aa
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 15:24:37 2014 +1000
   Merge branch 'integration/master' into rhbz1104015
   Conflicts:
  	zanata-war/src/main/resources/messages.properties

    commit 30a2fbe19100e7fa3aaf5469b5a658924cef3e6a
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 15:12:35 2014 +1000
   Refactor JPACopier

    commit 53e441459ae9c6239acc10f18950d80dd062e2ad
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 08:53:54 2014 +1000
   WIP: fixing test

    commit 639efdc86068bd4695c8d729a0cefd83783981de
    Merge: dfc12f3 2e0439b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 15:44:25 2014 +1000
   Merge branch 'integration/master' into rhbz1104015

    commit dfc12f33c67f525ac44360301443f71b06eb67ff
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 15:11:44 2014 +1000
   WIP: refactoring copy bean implementation

    commit e85c7c19b1182f3a7afc77ea82c8f634f8197c60
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 08:29:55 2014 +1000
   Refactor return type

    commit 509e7f98bd52c72fd9895db5a93e0c24ea290992
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 28 09:24:36 2014 +1000
   Fix test

    commit 885727c0839ffdf1084c5a118c2b51b7acd4fc73
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 28 07:41:57 2014 +1000
   Refactor beanUtil

    commit 028336ae8ec9544f1a6cce9368a70f9da5c85345
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 23 15:05:56 2014 +1000
   Update comments, refactor copy of Collection type in beanUtils

    commit aa3ea50dccd445940f60079ee1294b55e83324f4
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 23 10:03:40 2014 +1000
   Update powermock version used in zanata-model

    commit 8ada818fed2b180f8941910716faf25c83d5e3f6
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 22 12:42:54 2014 +1000
   Fix plural copy, move Copy annotation to getter method

    commit 5dcfd0ec06179b7bef9476901fe760623f2c2c39
    Merge: f9710b4 4f02f0a
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 21 10:40:09 2014 +1000
   Merge branch 'integration/master' into rhbz1104015

    commit f9710b467f211052fd30a06ac62d2fed420a7e51
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 21 09:42:31 2014 +1000
   Add unit test for beanUtils

    commit ea5d7804da100b5b9f590c15eb9908fd2ebb4613
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jul 18 10:30:30 2014 +1000
   Implement annotation Copy for cloning property

    commit be178d518dbc29ca9e08e6cf5932d02bfd1e3a34
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 17 15:08:54 2014 +1000
   WIP: copy version refactoring

    commit 6e07eed21a1acbac8c77c85a479bf6bb41def14f
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 17 10:16:58 2014 +1000
   WIP: Copy annotation

    commit 0d80531f850d387449913014c09563e3f93c6480
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jul 11 15:05:09 2014 +1000
   Implement copy version progress in version-tab

    commit 80d8404f632a622367dcd25b85e4debbe6b4f8b5
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 10 15:24:31 2014 +1000
   WIP: show copy progress in project page

    commit d43624b57e92f30af4098dd26639a00e48f99bdf
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 9 15:16:02 2014 +1000
   add batch process unit test

    commit 6a2f3fa47370c4532d0d7a3101a6e8d530445d7f
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 8 15:20:49 2014 +1000
   Round to 4 decimal for progress bar complete

    commit b029e3c20418b02abab3dca3d899a88336bfe4d6
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 8 15:10:06 2014 +1000
   Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015


  Commit: e860cfd831417d800fe9f1a7109d80654972791a
      https://github.com/zanata/zanata-server/commit/e860cfd831417d800fe9f1a7109d80654972791a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  Update deps to satisfy requireUpperBoundDeps enforcer


  Commit: 3493acba87a0a0039921a7f2fc75f76679829279
      https://github.com/zanata/zanata-server/commit/3493acba87a0a0039921a7f2fc75f76679829279
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 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:
  -----------
  Ensure that RESTEasy is packaged with war, for WildFly compatibility


  Commit: ef369a8e6474fa0b459bfd04554340c0db1fc800
      https://github.com/zanata/zanata-server/commit/ef369a8e6474fa0b459bfd04554340c0db1fc800
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M pom.xml
    R zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
    R zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/mysql.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Update JavaMelody; clean up old dialect code


  Commit: db170891cab65c1dbd85573c0ab03ce017346d23
      https://github.com/zanata/zanata-server/commit/db170891cab65c1dbd85573c0ab03ce017346d23
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade JavaMelody again


  Commit: 2b5db8ad72c7ba3c373bfd66932c9d7b9a45854b
      https://github.com/zanata/zanata-server/commit/2b5db8ad72c7ba3c373bfd66932c9d7b9a45854b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

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

  Log Message:
  -----------
  Downgrade gwtmockito since we can't use GWT 2.6.0 yet

Also upgrade GWT from 2.5.0 to 2.5.1


  Commit: 6530c61b077fd19a6a314466c58b958fe78bfa0a
      https://github.com/zanata/zanata-server/commit/6530c61b077fd19a6a314466c58b958fe78bfa0a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Clear HProjectIteration_Locale between tests


  Commit: 42f576af91ac32b7b7a724ff1cd85eafcb61ef97
      https://github.com/zanata/zanata-server/commit/42f576af91ac32b7b7a724ff1cd85eafcb61ef97
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension

  Log Message:
  -----------
  Add DummyAuthenticationMechanism to replace SPNEGO on WildFly


  Commit: 0ebe085a9754b296585720af294459f4f611a66e
      https://github.com/zanata/zanata-server/commit/0ebe085a9754b296585720af294459f4f611a66e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Add comments to persistence.xml


  Commit: d894fefa2f25d8c1d077cc758b61fd28ee2b8180
      https://github.com/zanata/zanata-server/commit/d894fefa2f25d8c1d077cc758b61fd28ee2b8180
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

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

  Log Message:
  -----------
  Update jboss-deployment-structure.xml to be compatible with WildFly 8.1 and EAP 6


  Commit: 7c386a51ff8c8175b7c7e588d371fc046b311e41
      https://github.com/zanata/zanata-server/commit/7c386a51ff8c8175b7c7e588d371fc046b311e41
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java

  Log Message:
  -----------
  Remove invalid use of @NonEmpty on a setter


  Commit: b28c9344a83a2a2f838f04e9d16bafc4b1fa5994
      https://github.com/zanata/zanata-server/commit/b28c9344a83a2a2f838f04e9d16bafc4b1fa5994
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M pom.xml
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Fix war overlay in functional-test

- added a new module to create the overlay (with only needed code and libraries)
- functional test will no longer build war overlay but just executing tests


  Commit: 481717409c7c4213a246e9065a9d5f945796a6e1
      https://github.com/zanata/zanata-server/commit/481717409c7c4213a246e9065a9d5f945796a6e1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M pom.xml
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #556 from zanata/fix-war-overlay

Fix war overlay in functional-test


  Commit: c383a99209c240af03e836bc28121c0a01a8841a
      https://github.com/zanata/zanata-server/commit/c383a99209c240af03e836bc28121c0a01a8841a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  fix after overlay rename


  Commit: ce99e7e947400af3a192d2e1d1c85b40d1aab187
      https://github.com/zanata/zanata-server/commit/ce99e7e947400af3a192d2e1d1c85b40d1aab187
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

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

  Log Message:
  -----------
  fix home and help content config to be consistent with other config


  Commit: 07991437e304eb2c16bfd1e355d0e60f3d0e9fcf
      https://github.com/zanata/zanata-server/commit/07991437e304eb2c16bfd1e355d0e60f3d0e9fcf
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #559 from zanata/fix-home-content-config

Prevent access failure when editing home content or help content.


  Commit: 6ab883aaa9d154ee7b5cfb92c8a20ce0d82a47a7
      https://github.com/zanata/zanata-server/commit/6ab883aaa9d154ee7b5cfb92c8a20ce0d82a47a7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-19 (Tue, 19 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

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


  Commit: 49a9dfab83343cd46b83982886c492b1ac986144
      https://github.com/zanata/zanata-server/commit/49a9dfab83343cd46b83982886c492b1ac986144
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    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

  Log Message:
  -----------
  Change url in group project tab to version link
https://bugzilla.redhat.com/show_bug.cgi?id=1128954

Squashed commit of the following:

commit 3ee9c622edbd4fc9b9ce0126d16c3983c48c6044
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 14 15:04:44 2014 +1000

    Change url in group project tab to version link

commit a9a0735189cf2b95d3d01c26dc15d83aa07e7265
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 14 13:40:27 2014 +1000

    Make link a selected locale url in group page:
    https://bugzilla.redhat.com/show_bug.cgi?id=1128954


  Commit: a2cc569dcfaae025346949979177d535d072b059
      https://github.com/zanata/zanata-server/commit/a2cc569dcfaae025346949979177d535d072b059
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml

  Log Message:
  -----------
      Fix create version page: https://bugzilla.redhat.com/show_bug.cgi?id=1129906


  Commit: cb5413aaa6f836d88e6b14137be6f06fd2b71cd4
      https://github.com/zanata/zanata-server/commit/cb5413aaa6f836d88e6b14137be6f06fd2b71cd4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.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/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    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/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextAreaWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

  Log Message:
  -----------
  Update editor UI: https://bugzilla.redhat.com/show_bug.cgi?id=1131300

Squashed commit of the following:

commit 55c10fbbdda280868ce2d7456c49e3d1751bc86c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 19 09:19:16 2014 +1000

    Update on tm and glossary view

commit e220205fa503b82ea70f3fd363efc0f8c7a6db98
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 13:55:05 2014 +1000

    Refactor and make selection section more obvious

commit c78ee8bdc08f0508408db05a3d697f80cc028124
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 10:48:37 2014 +1000

    Re-enable unit test

commit 9d2aaee41ff7651be190edabfeb41de163c33b69
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 10:15:19 2014 +1000

    fix unit test

commit 974f4f5326feeebe56a4f5dbaec302f0f716735d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 09:58:29 2014 +1000

    Update GWT editor


  Commit: e6fe2347e2a3c81dcb2fdc849ef991637fa5c300
      https://github.com/zanata/zanata-server/commit/e6fe2347e2a3c81dcb2fdc849ef991637fa5c300
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #551 from zanata/fix-cancel-copytrans-mouseover

Fix cancel copy translations mouseover hint


  Commit: 40bafe99432e4dec0987feea2ca4a8fb876056e0
      https://github.com/zanata/zanata-server/commit/40bafe99432e4dec0987feea2ca4a8fb876056e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
	zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java


  Commit: 76f37a2ad89183b16ea2e750fc4e5ce1ff80355e
      https://github.com/zanata/zanata-server/commit/76f37a2ad89183b16ea2e750fc4e5ce1ff80355e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

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

  Log Message:
  -----------
  Fix document access from version page, documents' tab.

Corrects an issue on this specific page: when clicking on a file with a path on it, the languages' list does not get updated with the available languages.


  Commit: 10103e1910a900833da90105f4ed9d5a18c51540
      https://github.com/zanata/zanata-server/commit/10103e1910a900833da90105f4ed9d5a18c51540
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #565 from zanata/doclist

Fix document access from version page, documents' tab.


  Commit: 9f08d866ecfbeef0be5dd280a0831ff4bae24cf5
      https://github.com/zanata/zanata-server/commit/9f08d866ecfbeef0be5dd280a0831ff4bae24cf5
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M pom.xml
    A zanata-war/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    A zanata-war/src/main/webapp/resources/script/jquery-2.0.3-min.js
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  JSF performance improvements - https://github.com/zanata/zanata-server/pull/566

Squashed commit of the following:

commit 2e1df8385401f8cadb47d5c89096c5c8ad2fc0a4
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Fri Aug 29 15:45:10 2014 +1000

    Manually import jquery in case richfaces doesn’t.

    This will not generate an extra request for the jquery resource, since it’s using outputScript, JSF is aware that it has already imported it.

commit 79e7aca7704052203ce08bba45a86839631f70f8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Aug 28 17:12:34 2014 +1000

    JSF performance improvements

    - Enabled resource optimization which allows richfaces to compress and unify several of its javascript and css resources into a single request. This mode can be disabled by setting the project stage to ‘Development’ (see web.xml).
    - Switch several internally served javascript resources to use the JSF resource filter to allow for caching.
    - Replace Richfaces’ provided JSF jquery with a higher versioned one. This script is now back in the war file.
    - Remove unnecessary inclusions of the richfaces provided jquery library.
    - Reorganize some javascript resources to the bottom of the page per best practices.
    - Upgrade Richfaces libraries.


  Commit: d98e12b9c228be7d40195fa1280d760dc33d8559
      https://github.com/zanata/zanata-server/commit/d98e12b9c228be7d40195fa1280d760dc33d8559
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

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

  Log Message:
  -----------
  Merge commit '95bbfad' into integration/master


  Commit: 2499c61db79777ce85dd2f5b6d34d92f0243369e
      https://github.com/zanata/zanata-server/commit/2499c61db79777ce85dd2f5b6d34d92f0243369e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java

  Log Message:
  -----------
  Allow changes in whitespace


  Commit: a765a128dfefbd5adef8016df184276b623a6ca4
      https://github.com/zanata/zanata-server/commit/a765a128dfefbd5adef8016df184276b623a6ca4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java

  Log Message:
  -----------
  Merge pull request #570 from zanata/fix-email-test

Allow changes in whitespace


  Commit: 711b0bd82d4e78b3b4e2a9e63c2ec1a080e9ddc0
      https://github.com/zanata/zanata-server/commit/711b0bd82d4e78b3b4e2a9e63c2ec1a080e9ddc0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

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

  Log Message:
  -----------
  New startup banner (italics).

Pull request: https://github.com/zanata/zanata-server/pull/568


  Commit: 1632f7ffe4127b7ba70bc7ab4558993256b8d9ba
      https://github.com/zanata/zanata-server/commit/1632f7ffe4127b7ba70bc7ab4558993256b8d9ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java

  Log Message:
  -----------
  Fix multi-line handling


  Commit: 712e7c46ee7cca8ae8cffe204208230409268dea
      https://github.com/zanata/zanata-server/commit/712e7c46ee7cca8ae8cffe204208230409268dea
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.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/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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Fix editor and project tests

Editor buttons changed
Upload forces only supported types
Single field on first version created
Also, there is a version languages setting behaviour that needs to
be reviewed. Ignored for now.


  Commit: a24819035e0343a6bf489d63f44cb2d1a8bab572
      https://github.com/zanata/zanata-server/commit/a24819035e0343a6bf489d63f44cb2d1a8bab572
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.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/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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #572 from zanata/fix-editor-and-project-tests

Fix editor and project tests


  Commit: e17d5f670740142c5c5bd84996c71fc904e3ceab
      https://github.com/zanata/zanata-server/commit/e17d5f670740142c5c5bd84996c71fc904e3ceab
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 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/misc/ContactAdminTest.java

  Log Message:
  -----------
  Use rest caller in upload tests, fix breakages

There were a few errors regarding project and version creation.
Using the ZanataRestCaller removes these and reduces test runtime
by roughly 10 seconds where a project and version needs to be
created.
Also make the contact admin test less strict.


  Commit: 163d1b78f10c6c6c269f3a8b87326111cc5ea1d8
      https://github.com/zanata/zanata-server/commit/163d1b78f10c6c6c269f3a8b87326111cc5ea1d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 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/misc/ContactAdminTest.java

  Log Message:
  -----------
  Merge pull request #573 from zanata/use-restcaller-in-uploadtest

Use rest caller in upload tests, fix breakages


  Commit: db6b7d0ccd35ffafeadbd62a02d29501fbb152bb
      https://github.com/zanata/zanata-server/commit/db6b7d0ccd35ffafeadbd62a02d29501fbb152bb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

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

  Log Message:
  -----------
  Fix test Editor page validation settings button


  Commit: ba0b877d6372a077fd950aa292f52459cacad81a
      https://github.com/zanata/zanata-server/commit/ba0b877d6372a077fd950aa292f52459cacad81a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

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

  Log Message:
  -----------
  Merge pull request #578 from zanata/test-fix-validations-button

Fix test Editor page validation settings button


  Commit: 4d912570e1040abace2f5ee46290ad0e712f69ed
      https://github.com/zanata/zanata-server/commit/4d912570e1040abace2f5ee46290ad0e712f69ed
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

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


  Commit: 7281ca9ace515a3e7583b2a2072482535a76798d
      https://github.com/zanata/zanata-server/commit/7281ca9ace515a3e7583b2a2072482535a76798d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Set max PermGen to 256MB for surefire


  Commit: ef690e03f7ae6a4cd05b6864d4e90267f7e8aee2
      https://github.com/zanata/zanata-server/commit/ef690e03f7ae6a4cd05b6864d4e90267f7e8aee2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Fix focus on selected transunit in editor and long string in tu details


  Commit: 4d677fcee3d53468c793f41cb78ff9c0fecb3f83
      https://github.com/zanata/zanata-server/commit/4d677fcee3d53468c793f41cb78ff9c0fecb3f83
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-09 (Tue, 09 Sep 2014)

  Changed paths:
    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
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.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/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleManagePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.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/groups/VersionGroupsPage.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/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/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.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/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.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/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Add test log steps to page functions

Each function states what the purpose is, so that the developer
can immediately see where the test was at the time of failure.

Also removes some minor duplicated code and fixes editor page
column query.


  Commit: 29fce14ffdf14fb074b5c61209c871959e5482bf
      https://github.com/zanata/zanata-server/commit/29fce14ffdf14fb074b5c61209c871959e5482bf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-09 (Tue, 09 Sep 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java

  Log Message:
  -----------
  Use isEmpty instead of size isEqualTo 0, to get better error messages


  Commit: 69c7e843a9fadbab1347c299857ef0cf65290ae2
      https://github.com/zanata/zanata-server/commit/69c7e843a9fadbab1347c299857ef0cf65290ae2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

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

  Log Message:
  -----------
  Fix create first version in project: https://bugzilla.redhat.com/show_bug.cgi?id=1140429


  Commit: f8529af4110909ccc3137e8deb33ad5049aeaf56
      https://github.com/zanata/zanata-server/commit/f8529af4110909ccc3137e8deb33ad5049aeaf56
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    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
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.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/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleManagePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.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/groups/VersionGroupsPage.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/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/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.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/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.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/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Merge pull request #583 from zanata/test-logging

Add test log steps to page functions


  Commit: 2ef538cc904ae505624ca4bd148d2d179569719a
      https://github.com/zanata/zanata-server/commit/2ef538cc904ae505624ca4bd148d2d179569719a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Disable broken test: EditVersionValidationsTest.verifyValidationsAreErrors


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

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    A functional-test/src/test/resources/conf/standalone_wildfly.xml

  Log Message:
  -----------
  add profile to functional-test to run against wildfly 8

https://github.com/zanata/zanata-server/pull/560


  Commit: 19ad2f8fb6afef33bbaab71be0ff1e3c00604264
      https://github.com/zanata/zanata-server/commit/19ad2f8fb6afef33bbaab71be0ff1e3c00604264
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

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

  Log Message:
  -----------
  Fix the broken validations test

The validation error box function was not searching the right place
for the appropriate component.


  Commit: 4bdcada277473d9bf673f321b94c8ed0560bbe28
      https://github.com/zanata/zanata-server/commit/4bdcada277473d9bf673f321b94c8ed0560bbe28
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

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

  Log Message:
  -----------
  Merge pull request #585 from zanata/fix-broken-validation-test

Fix the broken validations test


  Commit: e3403194e268c138b6b63f9c3f2c2c61f1c103bf
      https://github.com/zanata/zanata-server/commit/e3403194e268c138b6b63f9c3f2c2c61f1c103bf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Merge pull request #553 from zanata/clear-HProjectIteration_Locale

Clear HProjectIteration_Locale between tests


  Commit: 71d89a14ca5e61f83a0db32dfb52afaa3cb6e838
      https://github.com/zanata/zanata-server/commit/71d89a14ca5e61f83a0db32dfb52afaa3cb6e838
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Fix tests that break on Wildfly

These tests are more generally robust as a result.


  Commit: 9a0b0f73516f704f97dd65688304f3aaca6eaf3d
      https://github.com/zanata/zanata-server/commit/9a0b0f73516f704f97dd65688304f3aaca6eaf3d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Merge pull request #588 from zanata/fix-ftest-wildfly

Fix tests that break on Wildfly


  Commit: e81b9123e242f2c73e2489e9b2bb515d7926e781
      https://github.com/zanata/zanata-server/commit/e81b9123e242f2c73e2489e9b2bb515d7926e781
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    A build.sh
    A etc/scripts/allocate-jboss-ports
    A etc/scripts/allocate-ports
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    M pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/etc/zanata-ds.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrapperManager.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/account/logout.xhtml
    R zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/resources/arquillian.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    R zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  WildFly fixes, test configuration and dynamic ports

Merge pull request: https://github.com/zanata/zanata-server/pull/567
Squashed commit of the following:

commit aae9a3424d92cb4c58d14516120a0bd22d1bd877
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 19 16:05:10 2014 +1000

    Switch embedded wildfly to managed

commit b688b87926a3e2ae251d59c8dcbb3e84079f9bcd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Sep 19 13:54:56 2014 +1000

    Correct issue when logging out from certain pages.

commit 991bd93320603a3a7f62b0a43e77d1caddd9b7b1
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 19 12:48:44 2014 +1000

    Activate profiles with -Dappserver=(jbosseap6|wildfly8)

commit 86f1565de2da801aeefbe5613f7a2324ab0447bc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 21:04:11 2014 +1000

    Change allocate-jboss-ports to work in Jenkins

commit 97a2b0494765c01e48b8f9d22f3616a8edf6c0d2
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 16:33:15 2014 +1000

    Fix port

commit 9da422affd7fb2212259736a9b115ed954fa608f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 15:20:57 2014 +1000

    Remove use of tmp war (cont.)

commit 83473570b87e954ad97c9db0d4429a345c3058a5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 15:11:39 2014 +1000

    Correct management port for wildfly

commit 6d93043245e653c373b02a3ccc6dc8884dcdceb3
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 13:40:40 2014 +1000

    Remove misplaced Maven property expression

commit 47957cbe8a594206825d760389fb6d974ee25f5a
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 17 20:48:04 2014 +1000

    Clean up pom for static analysers

    - Update shrinkwrap and transitive test dependencies to satisfy
      RequireUpperBoundDeps
    - Exclude org.jboss.remoting3 (duplicates org.jboss.remoting classes)

commit ddb30e4558fe232dd79508b73f93b7496e77bdcc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 17 18:18:36 2014 +1000

    Allocate ports separately

commit 5a2dca806c9ffdc9d69792ec778128cc3a17da3b
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 14:11:44 2014 +1000

    Split arquillian config into two profiles: jbosseap6 & wildfly81

commit 82ead14a9a54f73a1134323de0b3880fee8d4d03
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 10:17:56 2014 +1000

    Remove use of tmp war

commit 949b2bb18ba48094d67be3bfa4a78603c9739f55
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 10:48:53 2014 +1000

    Fix profile activation on Maven 3.2.2+ (MNG-4565)

commit 21cae282cd0554337c702ec7daa838a794462d1e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 21:02:45 2014 +1000

    Control WildFly ports via environment variables

commit 358c87a335c2d2a602c0e8dbb580568dde0cb377
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 16:16:22 2014 +1000

    Rewrite allocate-ports in Python for faster startup

commit 1f4c2225090413a6c06da55f4495cc9ae3ca3939
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 15:59:31 2014 +1000

    Generate unused port numbers for JBoss using Groovy script

commit 529d8eb19973c429bfe1c198259f171546c6193c
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 12 15:39:42 2014 +1000

    Make ports configurable via system properties and env vars

    Also set port-offset=0 and adjust port numbers manually (by adding 100)

commit cacfcef2cf760d11036992ac128d8be33e3fbb14
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 16:35:34 2014 +1000

    Log permission check failure as WARN, success as DEBUG

commit 68823a3482fdad71f8c1c09e2d0b7467cf1fac0b
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 13:29:54 2014 +1000

    Adjust programmatic log config in ZanataInit

commit b7d45cb9fa306c8c83be34dbb8a233764670b9ac
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 10:23:01 2014 +1000

    Delete HTextFlowHistory before HTextFlow

commit 5419e0f9cf0dd0b0501e0c3da4537af2e22d70a1
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 4 13:11:48 2014 +1000

    Enhance connection wrapping: logging, configuration, mariadb

    - Log information about database and driver.
    - Check for supported database/version.
    - Add system property 'zanata.connection.use.wrapper' for explicit
      control.
    - Disable connection wrapping for mariadb as well as mysql.
    - Log what WrapperManager does.

commit 1d6a942164a3cf4ec8b1d842861d920097b43026
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 4 12:56:38 2014 +1000

    Enable connection debugging

commit 4fafeeefd215ea25d27b791bcff51cd9d1199b65
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 3 10:53:48 2014 +1000

    Send Velocity log to SLF4J (via Commons Logging)

commit ff71c09d1cd306586f32ae4fcd954ee06fd2a484
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Aug 29 15:16:28 2014 +1000

    Add workarounds for WildFly bugs: WFLY-3617, WFLY-3744

commit 1e3e8894cfbca5cfcda12b69c2f1c1061aa44ff4
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Aug 29 15:13:57 2014 +1000

    Put GWT dependencies last to ensure they don't override Java APIs

commit a80270fd1b6d1c4802710cac34bca3a33e54e8cf
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Aug 28 09:03:48 2014 +1000

    Fix issue when logging out in wildfly.

    An unnecessary logout.xhtml page was being used to be able to capture the request, perform the logout and redirect to the home page again. This is not necesary and might be causing an intermitent problem in wildfly.


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    A functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    A zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/PerformanceProfiling.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  squash merge improve push performance

https://github.com/zanata/zanata-server/pull/571


  Commit: c0b71653056c90389283b5b68541e9829b0e182f
      https://github.com/zanata/zanata-server/commit/c0b71653056c90389283b5b68541e9829b0e182f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Fix some tests as revealed broken by Wildfly

Expect a notification on password change.
Wait for calls to stop before accessing the docs list.


  Commit: 3ba156895eb4081f7e5d94eb85e5eda469aa9048
      https://github.com/zanata/zanata-server/commit/3ba156895eb4081f7e5d94eb85e5eda469aa9048
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  update api version


  Commit: 39e6662486f2678271ce1de31a42c0ad00604442
      https://github.com/zanata/zanata-server/commit/39e6662486f2678271ce1de31a42c0ad00604442
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Merge pull request #590 from zanata/fix-more-wildfly-ftests

Fix some tests as revealed broken by Wildfly


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

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

  Log Message:
  -----------
  rhbz1144234 - fix download config link


  Commit: 645fdd25582cdd3a918b2e1325f3ee538de2a96c
      https://github.com/zanata/zanata-server/commit/645fdd25582cdd3a918b2e1325f3ee538de2a96c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

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

  Log Message:
  -----------
  Merge pull request #591 from zanata/rhbz1144234

rhbz1144234 - fix download config link


  Commit: 18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
      https://github.com/zanata/zanata-server/commit/18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

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


Compare: https://github.com/zanata/zanata-server/compare/48d12c37ded2...18385b62fb0b


More information about the zanata-commits mailing list