[zanata/zanata-server] c51355: Use a jndi configured infinispan cache instead of ...

GitHub noreply at github.com
Mon Jun 15 02:11:08 UTC 2015


  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: c513552187f78dcf7db96af66c6f2b6236c85a71
      https://github.com/zanata/zanata-server/commit/c513552187f78dcf7db96af66c6f2b6236c85a71
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.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/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Use a jndi configured infinispan cache instead of ehcahce.

Need to add this to standalone.xml’s infinispan cache container:
jndi-name="java:jboss/infinispan/container/hibernate" start="EAGER"


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

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    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:
  -----------
  Use infinispan as the hibernate search backend.

This revision handles the whole index in memory.


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

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

  Log Message:
  -----------
  WIP: Adding infinispan-backed hibernate search.


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

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

  Log Message:
  -----------
  Re-instate Lucene version property.


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

  Changed paths:
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.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/java/org/zanata/util/ServiceLocator.java

  Log Message:
  -----------
  Change explicit uses of EhCache for Infinispan.

Implement an infinispan cache wrapper.


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

  Changed paths:
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.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

  Log Message:
  -----------
  Use injection for the Infinispan cache manager.


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

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

  Log Message:
  -----------
  Upgrade hibernate and fix infinispan dependency.

Using hibernate dependency as specified by the JBoss AS 7 bom.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Add test cache container to unit tests.

This is a memory-only Infinispan cache container.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Configure Arquillian integration tests to use Infinispan.

Configuration is kept to in-memory at all times, since persistence should not be needed for integration tests.


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

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  Ammend functional test container configuration to use Infinispan.

Using the same configuration as in integration tests in this revision. It could be adapted to use more production-level settings like cache persistence if so required.


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

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.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/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Code review updates for Infinispan caches.


  Commit: f245c4a6c664c6aca687c09c7550a60683fdb8da
      https://github.com/zanata/zanata-server/commit/f245c4a6c664c6aca687c09c7550a60683fdb8da
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M .gitignore
    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
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.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/ManageUserPage.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/dashboardsettings/DashboardClientTab.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
    A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.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/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/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/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/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.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/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    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/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/account/changepassword.xhtml
    A zanata-war/src/main/webapp/app/config.json
    A zanata-war/src/main/webapp/app/css/app.css
    A zanata-war/src/main/webapp/app/css/libs.css
    A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
    A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    A zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/app/js/app.js
    A zanata-war/src/main/webapp/app/js/libs.js
    A zanata-war/src/main/webapp/app/js/templates.js
    A zanata-war/src/main/webapp/app/maps/app.js.map
    A zanata-war/src/main/webapp/app/maps/libs.js.map
    A zanata-war/src/main/webapp/app/translations/de.json
    A zanata-war/src/main/webapp/app/translations/fr.json
    A zanata-war/src/main/webapp/app/translations/locales
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.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/webtrans/server/rpc/AddReviewCommentHandlerTest.java

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


  Commit: 71204e9496c71bf6e07f23180c6276bba4f2c694
      https://github.com/zanata/zanata-server/commit/71204e9496c71bf6e07f23180c6276bba4f2c694
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

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

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

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


  Commit: db35acc7ba385a9c9d4b6abd22fe674861adce09
      https://github.com/zanata/zanata-server/commit/db35acc7ba385a9c9d4b6abd22fe674861adce09
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/async/Async.java
    A zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskResult.java
    R zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
    R zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    A zanata-war/src/main/java/org/zanata/async/ContainsAsyncMethods.java
    R zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    R zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    R zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    R zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    A zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    A zanata-war/src/main/java/org/zanata/service/TranslationArchiveService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    R zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    A zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M 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/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
	zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java


  Commit: 7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
      https://github.com/zanata/zanata-server/commit/7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  Rollback changes for hibernate search on top of Infinispan.

This will be tackled as a separate pull request, as there are some performance problems with the combination in question that warrant further investigation.


  Commit: 5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
      https://github.com/zanata/zanata-server/commit/5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java

  Log Message:
  -----------
  Make sure Zanata cannot start if the infinispan cache is not configured.


  Commit: 9956fe13ee2e75bfedd6b509ada096e2d4c51966
      https://github.com/zanata/zanata-server/commit/9956fe13ee2e75bfedd6b509ada096e2d4c51966
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  add plural form for me-ME


  Commit: b2c6d3b6c833ceed2495701ffca52737a66fea1d
      https://github.com/zanata/zanata-server/commit/b2c6d3b6c833ceed2495701ffca52737a66fea1d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml
    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
    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/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/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.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
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.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/VersionGeneralTab.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/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
    M functional-test/src/main/java/org/zanata/util/ScreenshotDirForTest.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M 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/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/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.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/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/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.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/language/ContactLanguageTeamTest.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/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.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/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M 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
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/NoScreenshot.java
    M functional-test/src/test/java/org/zanata/util/RetryRule.java
    M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/setup.properties
    A functional-test/src/test/resources/upload-idml.idml
    A functional-test/src/test/resources/upload-odg.odg
    A functional-test/src/test/resources/upload-odp.odp
    A functional-test/src/test/resources/upload-ods.ods
    A functional-test/src/test/resources/upload-odt.odt
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    A zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.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/VersionHome.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/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JSONType.java
    A zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    R zanata-war/src/main/java/org/zanata/ui/ColumnSort.java
    R zanata-war/src/main/java/org/zanata/ui/ColumnSortCompositeComponent.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.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/SourcePanel.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/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.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/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
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    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/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/search.xhtml
    M zanata-war/src/main/webapp/admin/stats.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/language/home.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/fontello/css/fontello.css
    R zanata-war/src/main/webapp/resources/richext/columnSorter.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'master' into infinispan

Conflicts:
	zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java


  Commit: 0501b44f5bbb89b6487823d8c5ad064fcf47470c
      https://github.com/zanata/zanata-server/commit/0501b44f5bbb89b6487823d8c5ad064fcf47470c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  Refactor initialization logic for cache container.


  Commit: 8d9862f84ceb2824385f4d1c537bd8559336e0d5
      https://github.com/zanata/zanata-server/commit/8d9862f84ceb2824385f4d1c537bd8559336e0d5
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Compilation error fixes.


  Commit: acb834906d62314566e8ccdf0e1c557008e05ddc
      https://github.com/zanata/zanata-server/commit/acb834906d62314566e8ccdf0e1c557008e05ddc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    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/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/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Fix test element focus issues

In some cases, element.blur works more reliably than a page click


  Commit: bb25da8608cc5ac1ad0680db315e49049cd2ec46
      https://github.com/zanata/zanata-server/commit/bb25da8608cc5ac1ad0680db315e49049cd2ec46
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

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

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


  Commit: e22728b9dbfcc8f53b240580fc7095bb72372f4c
      https://github.com/zanata/zanata-server/commit/e22728b9dbfcc8f53b240580fc7095bb72372f4c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
    A zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
    A zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/Event.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/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java

  Log Message:
  -----------
  Emulate CDI events with Seam Events


  Commit: d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
      https://github.com/zanata/zanata-server/commit/d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Change explode profile.

Some problems with the touching of the dodeploy file and made sure the profile can be activated via a property.


  Commit: e239f214029fbbcda7bd03ac49e29763c0999133
      https://github.com/zanata/zanata-server/commit/e239f214029fbbcda7bd03ac49e29763c0999133
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

  Log Message:
  -----------
  Replace the use of seam's jsf messages wrapper.

Create Zanata's own wrapper, which may be replaced later with a CDI extension if needed.


  Commit: 8cad539f4700d4cbdcd87170d9331effa5c8f683
      https://github.com/zanata/zanata-server/commit/8cad539f4700d4cbdcd87170d9331effa5c8f683
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.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/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.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/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java

  Log Message:
  -----------
  Replace all uses of Seam's FacesMessages.

Use Zanata's own FacesMessages class instead.


  Commit: d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
      https://github.com/zanata/zanata-server/commit/d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  Fix messages not appearing when ending conversations.

Implement a 'cache' of messages that gets transfered to the FacesContext using a jsf phase listener. Preety much what Seam does.


  Commit: 01e5b601b95b2e525efc735f24f9098610ce61bd
      https://github.com/zanata/zanata-server/commit/01e5b601b95b2e525efc735f24f9098610ce61bd
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java

  Log Message:
  -----------
  Fix some functional tests.

The new messages phase listener was acting at the wrong time and causing Seam to re-create some page scoped beans.


  Commit: 72fce56b7041e8cec9aa61d1633950b020d1328b
      https://github.com/zanata/zanata-server/commit/72fce56b7041e8cec9aa61d1633950b020d1328b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java

  Log Message:
  -----------
  Add unit tests to satisfy coverage requirements.


  Commit: e83d4f429484414e19742145f7e998f4994154b6
      https://github.com/zanata/zanata-server/commit/e83d4f429484414e19742145f7e998f4994154b6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #669 from zanata/fix-test-settings-tab

Wait for settings tab, be less wait-ish in waiting for it


  Commit: 880b79569ef2162a827a9559a3ecc452f41d1619
      https://github.com/zanata/zanata-server/commit/880b79569ef2162a827a9559a3ecc452f41d1619
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    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/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/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Merge pull request #668 from zanata/fix-focus-issues

Fix test element focus issues


  Commit: 3eae95f598ff57e13657b169621ab23de1c81e17
      https://github.com/zanata/zanata-server/commit/3eae95f598ff57e13657b169621ab23de1c81e17
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

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


  Commit: fe5c02ccd42750840eeae62448c36f726e1b3fdb
      https://github.com/zanata/zanata-server/commit/fe5c02ccd42750840eeae62448c36f726e1b3fdb
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html

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

* release:
  Replace CSS file with JS for loading Google Web Fonts


  Commit: a100b9f97b0d43054ae841e995af1cb19011c122
      https://github.com/zanata/zanata-server/commit/a100b9f97b0d43054ae841e995af1cb19011c122
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

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


  Commit: cc96b2faac089d22e160b91c1a59f63f666c2267
      https://github.com/zanata/zanata-server/commit/cc96b2faac089d22e160b91c1a59f63f666c2267
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

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


  Commit: 5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
      https://github.com/zanata/zanata-server/commit/5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java

  Log Message:
  -----------
  Update code formatting to match checkstyle rules


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

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    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/dashboard/DashboardBasePage.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/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/build.gradle
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html
    M zanata-war/src/test/resources/arquillian.xml

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

Conflicts:
	zanata-war/pom.xml


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

  Changed paths:
    M pom.xml
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.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/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.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/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java

  Log Message:
  -----------
  Improve unit test coverage


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java

  Log Message:
  -----------
  Add reason to Cobertura annotation


  Commit: 6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
      https://github.com/zanata/zanata-server/commit/6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Fix reindex page and remove duplicate language page.

https://bugzilla.redhat.com/show_bug.cgi?id=1097464

Squashed commit of the following:

commit e31dc3331db8c77b6ca6e692fca77d7105c01ba5
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 3 09:40:51 2015 +1000

    remove duplicate language page

commit e5c47ab602ad26627efa5b85c4ec8a8db8f64b38
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 17:14:39 2015 +1000

    Fix reindex page: https://bugzilla.redhat.com/show_bug.cgi?id=1097464


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

  Changed paths:
    M pom.xml
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.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/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.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/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java

  Log Message:
  -----------
  Merge pull request #682 from zanata/improve-coverage

Improve unit test coverage


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

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

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


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

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    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/dashboard/DashboardBasePage.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/ProjectBasePage.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/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.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/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-overlay/build.gradle
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.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/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.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/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
	zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
	zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java


  Commit: 1308b9da6f1ff267c4ea09fa20540dbe47f482de
      https://github.com/zanata/zanata-server/commit/1308b9da6f1ff267c4ea09fa20540dbe47f482de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

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

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


  Commit: f374e740fe602175e5557460527271ed54b2fc3e
      https://github.com/zanata/zanata-server/commit/f374e740fe602175e5557460527271ed54b2fc3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/resources/messages.properties
    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/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299

Squashed commit of the following:

commit 573fc4182e8113a9d98923fe0b64d7e1ad8697f3
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 07:12:00 2015 +1000

    Fix unit test

commit 31a614edb0eda39858bf3094592b26c8c994adc1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 15:17:04 2015 +1000

    Update zanata-api version to 3.7.0-SNAPSHOT

commit 5e6d63127c3dea1ef379c72dba88ca664783a61c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 14:07:42 2015 +1000

    Fix test for pushing translations

commit 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Merge: ebd1d43 b4b3c38
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 11:30:43 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

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

commit ebd1d43ede7ca44611c1110cc31c6f1d801c233d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 12:55:41 2015 +1000

    Fix unit test

commit dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
Merge: 5abeaad cc96b2f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jan 30 12:12:20 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

commit 5abeaad65f116fccb19423a7a6eeb1df9f6eeaaa
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 15:56:13 2015 +1000

    Implement myTrans options when upload translation

    https://bugzilla.redhat.com/show_bug.cgi?id=1184299


  Commit: 93444cb838d1ef7d07cd307b41894fea40e3a985
      https://github.com/zanata/zanata-server/commit/93444cb838d1ef7d07cd307b41894fea40e3a985
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java

  Log Message:
  -----------
  Eliminate all BOMs except jboss-javaee-6.0


  Commit: cb789da24cb3f4db1b5069c78ff5ecd53a75035c
      https://github.com/zanata/zanata-server/commit/cb789da24cb3f4db1b5069c78ff5ecd53a75035c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml

  Log Message:
  -----------
  Simplify webdriver config (use DISPLAY from env)


  Commit: d8b169b56af3bed8a42455154ed9a33f2c3eb0ba
      https://github.com/zanata/zanata-server/commit/d8b169b56af3bed8a42455154ed9a33f2c3eb0ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Update build.sh to use xvfb-run


  Commit: ecbb1f3b8e96ea34d5a047bdba5969173030d82e
      https://github.com/zanata/zanata-server/commit/ecbb1f3b8e96ea34d5a047bdba5969173030d82e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Remove obsolete config


  Commit: 0049e9464b1d74f6adf5eec47bdc373a5759a5ca
      https://github.com/zanata/zanata-server/commit/0049e9464b1d74f6adf5eec47bdc373a5759a5ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java

  Log Message:
  -----------
  Remove fragile file upload tests

We don't need functional tests to check the file storage back-end
(implementation detail).  General upload functionality is covered by
other tests in this package.


  Commit: d48794ca8885b64544520dd6ed694dfb8bcf0aa5
      https://github.com/zanata/zanata-server/commit/d48794ca8885b64544520dd6ed694dfb8bcf0aa5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Rerun failing integration tests up to three times


  Commit: 062565c69a67bdfba201613c3a47a41a012a0edf
      https://github.com/zanata/zanata-server/commit/062565c69a67bdfba201613c3a47a41a012a0edf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.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 zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-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/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708

Squashed commit of the following:

commit 863b2bb5727cd993cbb9982e0a2267c285b40369
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 14:39:25 2015 +1000

    Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708

commit f147b27487715611901dc45aa45417fc31712919
Merge: d42e58f f374e74
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 11:10:57 2015 +1000

    Merge branch 'integration/master' into rhbz1184708

commit d42e58ff84ac3e5b24531c274f58c8694a71125d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 09:53:45 2015 +1000

    Implement override plural forms:
    https://bugzilla.redhat.com/show_bug.cgi?id=1184708


  Commit: c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
      https://github.com/zanata/zanata-server/commit/c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml

  Log Message:
  -----------
  Update inactive account, password reset page. Remove captcha from password reset page.
https://bugzilla.redhat.com/show_bug.cgi?id=1191321

Squashed commit of the following:

commit 94837356020e34784e0ed8e67b89daa3709a5aa1
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 10 16:08:18 2015 +1000

    Update inactive account, password reset page. Remove captcha from password reset page.

    https://bugzilla.redhat.com/show_bug.cgi?id=1191321


  Commit: 51fd4b3e3c756b831026f9e01682edebd9fd40b1
      https://github.com/zanata/zanata-server/commit/51fd4b3e3c756b831026f9e01682edebd9fd40b1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  disable rendering in filter list if empty string
https://bugzilla.redhat.com/show_bug.cgi?id=1190557

Squashed commit of the following:

commit a1c6547965cacd3f1cac600524486f007d689e7e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 11 13:43:00 2015 +1000

    disable rendering in filter list if empty string: https://bugzilla.redhat.com/show_bug.cgi?id=1190557


  Commit: a828049979c44bab4d0415ac8784afacf35f04b7
      https://github.com/zanata/zanata-server/commit/a828049979c44bab4d0415ac8784afacf35f04b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Fix inactive account redirection with openid account

https://bugzilla.redhat.com/show_bug.cgi?id=1191827

Squashed commit of the following:

commit 0ddec629799a6bacc9c24c67d545a841dcd2e0ff
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 12:20:07 2015 +1000

    Fix inactive account redirection with openid account


  Commit: 8fe5f44d3483742730881a16b3974e940f0613a1
      https://github.com/zanata/zanata-server/commit/8fe5f44d3483742730881a16b3974e940f0613a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Selenium config changes

Upgrade Selenium version.
Send all cargo logging to stdout for easier correlation.
Enable a timeout for container startup (two minutes).


  Commit: 0f3d6b4e30ab872cb92506be49629f81ead7e2e5
      https://github.com/zanata/zanata-server/commit/0f3d6b4e30ab872cb92506be49629f81ead7e2e5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java

  Log Message:
  -----------
  Speed up successful login during tests


  Commit: 777698210d077fef28548468d70b3713badb7f89
      https://github.com/zanata/zanata-server/commit/777698210d077fef28548468d70b3713badb7f89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  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/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/versionsettings/VersionTranslationTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java

  Log Message:
  -----------
  Enhance AbstractPage and AjaxCounterBean

- Count outstanding timeouts with AjaxCounterBean too
- Use new WebDriverWait for each wait, instead of reusing
  FluentWait<WebDriver>
- Add AbstractPage.getExecutor() to minimise casting
- Add NamedPredicate for better failure messages


  Commit: 53ff0071b711cad41d1803eb6db448ce5ff54efe
      https://github.com/zanata/zanata-server/commit/53ff0071b711cad41d1803eb6db448ce5ff54efe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  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

  Log Message:
  -----------
  Change lookup for upload list elements to work around apparent Selenium bug


  Commit: d1d680da06cb17ae1123a9db381fa5ee029548f4
      https://github.com/zanata/zanata-server/commit/d1d680da06cb17ae1123a9db381fa5ee029548f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Fix management port mismatch


  Commit: 3b59176ca0acf58f3e76d92e5723d2df931336f0
      https://github.com/zanata/zanata-server/commit/3b59176ca0acf58f3e76d92e5723d2df931336f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/log4j.xml

  Log Message:
  -----------
  Enable logging in ad hoc functional tests


  Commit: e6eb6ec1e9fc59be0f2ead3d3eb5efebb6a890f9
      https://github.com/zanata/zanata-server/commit/e6eb6ec1e9fc59be0f2ead3d3eb5efebb6a890f9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Disable waiting for timeouts until tests can be updated


  Commit: 5520514517057ee9dbe0e755c502c96a844cd1c9
      https://github.com/zanata/zanata-server/commit/5520514517057ee9dbe0e755c502c96a844cd1c9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml

  Log Message:
  -----------
  Remove ANSI colour and UTC timezone from functional tests' logging


  Commit: 95cff3ed99a8c1a994e9da36d6824638ab1de1a6
      https://github.com/zanata/zanata-server/commit/95cff3ed99a8c1a994e9da36d6824638ab1de1a6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Attempt to fix some error message-related functional tests


  Commit: 2949c09e715ec902374eafb92892eb5df2cd32bc
      https://github.com/zanata/zanata-server/commit/2949c09e715ec902374eafb92892eb5df2cd32bc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.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/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Change the way we wait for errors in tests


  Commit: c32305a3d01e90a05be88909e4d7e45cbbc7119b
      https://github.com/zanata/zanata-server/commit/c32305a3d01e90a05be88909e4d7e45cbbc7119b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

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

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


  Commit: 62414b66bfa4b2de32b5b4b4ff8253e6ccc36742
      https://github.com/zanata/zanata-server/commit/62414b66bfa4b2de32b5b4b4ff8253e6ccc36742
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Wait for AJAX validation


  Commit: a46fb537f25fa773f8a0cb16e7310eee4b36c3d3
      https://github.com/zanata/zanata-server/commit/a46fb537f25fa773f8a0cb16e7310eee4b36c3d3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

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

  Log Message:
  -----------
  Wait for at least one notification message


  Commit: fd4300e62eab59f2672e4e4d4ac5ced7c350e2a4
      https://github.com/zanata/zanata-server/commit/fd4300e62eab59f2672e4e4d4ac5ced7c350e2a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java

  Log Message:
  -----------
  Defocus each field after clearing it


  Commit: 17c6646608c6920fab8964b22e3ce654617f79b7
      https://github.com/zanata/zanata-server/commit/17c6646608c6920fab8964b22e3ce654617f79b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

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


  Commit: 37c3344253f831b16925b0ff19061f2f98a4b06e
      https://github.com/zanata/zanata-server/commit/37c3344253f831b16925b0ff19061f2f98a4b06e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Avoid debug config when stopping cargo

This should prevent the following error at the end of test run:

[INFO] [talledLocalContainer] FATAL ERROR in native method: JDWP No transports initialized, jvmtiError=AGENT_ERROR_TRANSPORT_INIT(197)
[WARNING] [talledLocalContainer] ERROR: transport error 202: bind failed: Address already in use
[WARNING] [talledLocalContainer] ERROR: JDWP Transport dt_socket failed to initialize, TRANSPORT_INIT(510)
[WARNING] [talledLocalContainer] JDWP exit error AGENT_ERROR_TRANSPORT_INIT(197): No transports initialized [../../../src/share/back/debugInit.c:741]


  Commit: 61e28424edc21d1366b62ec34a3884d1ac591022
      https://github.com/zanata/zanata-server/commit/61e28424edc21d1366b62ec34a3884d1ac591022
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Allow 'no tests' when -Dit.test is used


  Commit: 81054b713c3d9b1e1962915188c8d40c6513c0b5
      https://github.com/zanata/zanata-server/commit/81054b713c3d9b1e1962915188c8d40c6513c0b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement customise language display name
https://bugzilla.redhat.com/show_bug.cgi?id=1169662

Squashed commit of the following:

commit 8a72ed3dfddee2a89cabe62a02df1cfd4f8862bb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 19:24:09 2015 +1000

    Implement customise language display name
    https://bugzilla.redhat.com/show_bug.cgi?id=1169662


  Commit: b319ce824c4fd49ce86b2814f17977b2bb16eae8
      https://github.com/zanata/zanata-server/commit/b319ce824c4fd49ce86b2814f17977b2bb16eae8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.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/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  Fix global messages in password reset page
https://bugzilla.redhat.com/show_bug.cgi?id=1191779

Squashed commit of the following:

commit 5aa8e22358bb84498dc566faeb43635d5bdf3212
Merge: 9be6611 a828049
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 17 14:54:32 2015 +1000

    Merge branch 'integration/master' into rhbz1191779

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

commit 9be6611801a09407879af1b8bf8eed2b466814d4
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 13:59:17 2015 +1000

    Fix global messages in password reset page: https://bugzilla.redhat.com/show_bug.cgi?id=1191779


  Commit: d22d4432651da7bad8139ee736edaa7f045fb2d2
      https://github.com/zanata/zanata-server/commit/d22d4432651da7bad8139ee736edaa7f045fb2d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

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

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


  Commit: 7a2a35d3d1799d514828fb12d3941f225308f02c
      https://github.com/zanata/zanata-server/commit/7a2a35d3d1799d514828fb12d3941f225308f02c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

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

  Log Message:
  -----------
  Add ability to wait for new page to load


  Commit: 5268b778530463e894b68f4ec5be10f7ca5cef9d
      https://github.com/zanata/zanata-server/commit/5268b778530463e894b68f4ec5be10f7ca5cef9d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html

  Log Message:
  -----------
  Add script to help with page load detection


  Commit: 58a21012fe86262b2c4a1b676ee7227759f5e2ce
      https://github.com/zanata/zanata-server/commit/58a21012fe86262b2c4a1b676ee7227759f5e2ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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
    A zanata-war/src/main/webapp/resources/script/finished.js

  Log Message:
  -----------
  Use deferred script for better testing accuracy


  Commit: a3e7763531fe17385d562d6a5ec3a066b5917748
      https://github.com/zanata/zanata-server/commit/a3e7763531fe17385d562d6a5ec3a066b5917748
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

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

  Log Message:
  -----------
  Update expected error message


  Commit: 79fbac57284db84fa4caa6fd8b83da3145766afa
      https://github.com/zanata/zanata-server/commit/79fbac57284db84fa4caa6fd8b83da3145766afa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #699 from zanata/fix-broken-password-tests

Fix validation messages for password reset


  Commit: 79dff1996867f15ca58365c311a5770096b02ba7
      https://github.com/zanata/zanata-server/commit/79dff1996867f15ca58365c311a5770096b02ba7
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

  Log Message:
  -----------
  Fix security functional test error


  Commit: 848ec39ca8bdeb81b587d8563e1e52a683e0bba2
      https://github.com/zanata/zanata-server/commit/848ec39ca8bdeb81b587d8563e1e52a683e0bba2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #701 from zanata/fix-invalidresetpassword-test

Fix security functional test error


  Commit: 8deed904a4d9e7a99b89c9d2656b9c024d4500f0
      https://github.com/zanata/zanata-server/commit/8deed904a4d9e7a99b89c9d2656b9c024d4500f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update parent version


  Commit: 3b0d55a8d4113479be77d0e9c667e9c4ef017066
      https://github.com/zanata/zanata-server/commit/3b0d55a8d4113479be77d0e9c667e9c4ef017066
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java

  Log Message:
  -----------
  Fix password reset with null pointer exception

Squashed commit of the following:

commit 4d6467768326f236379b302a80567bc5f93de6dc
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 24 10:38:19 2015 +1000

    Fix password reset with null pointer exception


  Commit: 009a0ddec84ebfea66fe9b494eaed84f96029310
      https://github.com/zanata/zanata-server/commit/009a0ddec84ebfea66fe9b494eaed84f96029310
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

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

Conflicts:
	pom.xml


  Commit: d3660bbdccaa682a51e257fee4f5a71c389c069a
      https://github.com/zanata/zanata-server/commit/d3660bbdccaa682a51e257fee4f5a71c389c069a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

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


  Commit: 7b339d81fe6393fe3c87ea2977fbf784d65c90e6
      https://github.com/zanata/zanata-server/commit/7b339d81fe6393fe3c87ea2977fbf784d65c90e6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java

  Log Message:
  -----------
  Fix MultiFileUploadTest.removeFileFromUploadList


  Commit: de4737af69432f0d4ba8aff846510eafed749f5d
      https://github.com/zanata/zanata-server/commit/de4737af69432f0d4ba8aff846510eafed749f5d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java

  Log Message:
  -----------
  Merge branch 'fix-MultiFileUploadTest' into fix-functional-test


  Commit: afc9708f7f66ff8c93e328b69c60aaac926eda8c
      https://github.com/zanata/zanata-server/commit/afc9708f7f66ff8c93e328b69c60aaac926eda8c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.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
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.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/security/SecurityTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-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/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.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/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/fix-functional-test' into reduce-boms

Conflicts:
	functional-test/src/main/java/org/zanata/page/AbstractPage.java
	functional-test/src/main/java/org/zanata/page/CorePage.java
	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
	functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
	functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
	functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java


  Commit: ee0c8ecd3cc2eae120340f74b17da71238790161
      https://github.com/zanata/zanata-server/commit/ee0c8ecd3cc2eae120340f74b17da71238790161
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #702 from zanata/fix-functional-test

Fix failed functional test


  Commit: 90758c22c904837577b07260bf93b227d71dc494
      https://github.com/zanata/zanata-server/commit/90758c22c904837577b07260bf93b227d71dc494
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Fix AjaxCounterBean


  Commit: 65445c90dc9be20e36025646eaafb1e0c7c3dada
      https://github.com/zanata/zanata-server/commit/65445c90dc9be20e36025646eaafb1e0c7c3dada
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M .gitignore
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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

  Log Message:
  -----------
  Fix the <script> tag for finished.js


  Commit: f4531d0c78f3b1f22ea32550303b50675035ae60
      https://github.com/zanata/zanata-server/commit/f4531d0c78f3b1f22ea32550303b50675035ae60
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

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

  Log Message:
  -----------
  Retry test cleanup


  Commit: a83084c5d10b77bc1f70363761ebc86ef7912d52
      https://github.com/zanata/zanata-server/commit/a83084c5d10b77bc1f70363761ebc86ef7912d52
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Enable browser logging after each test


  Commit: 69eb5776d9ca18e1391f7905be5e345d693d8d85
      https://github.com/zanata/zanata-server/commit/69eb5776d9ca18e1391f7905be5e345d693d8d85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.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
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.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/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    R zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
    R zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/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/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.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/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Merge branch 'master' into cdi-prep

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
	zanata-war/src/main/java/org/zanata/action/LanguageAction.java
	zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
	zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
	zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java


  Commit: ab3ad017ac0ee5811f2643e031f5f03e369dc544
      https://github.com/zanata/zanata-server/commit/ab3ad017ac0ee5811f2643e031f5f03e369dc544
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java

  Log Message:
  -----------
  Account activation tests


  Commit: 071d3b0ce41bc90c1276e6577337786eaaa5904c
      https://github.com/zanata/zanata-server/commit/071d3b0ce41bc90c1276e6577337786eaaa5904c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java

  Log Message:
  -----------
  Clean up


  Commit: 130579a8fedc9b1a466468a9977e07a690753720
      https://github.com/zanata/zanata-server/commit/130579a8fedc9b1a466468a9977e07a690753720
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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
    R zanata-war/src/main/webapp/resources/script/finished.js
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Tidy up finished.js


  Commit: db94455f1a424ccd23419d275a9d7d7db643566d
      https://github.com/zanata/zanata-server/commit/db94455f1a424ccd23419d275a9d7d7db643566d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    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
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.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/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.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/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M 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/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    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/app/index.html
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Merge pull request #685 from zanata/reduce-boms

Eliminate all BOMs except jboss-javaee-6.0


  Commit: 7f4463714eee3e0fe3957461f3e6b977863b99ad
      https://github.com/zanata/zanata-server/commit/7f4463714eee3e0fe3957461f3e6b977863b99ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix dependency problem


  Commit: f258e488784fb1114e8a323803336b0109fa0520
      https://github.com/zanata/zanata-server/commit/f258e488784fb1114e8a323803336b0109fa0520
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    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
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.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/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.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/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M 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/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    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/app/index.html
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Merge branch 'reduce-boms' into cdi-prep

Conflicts:
	pom.xml


  Commit: 3a44cd0957c1babb499b4fb61bd84f05d21f7029
      https://github.com/zanata/zanata-server/commit/3a44cd0957c1babb499b4fb61bd84f05d21f7029
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java

  Log Message:
  -----------
  Merge pull request #705 from zanata/activation-tests

Account activation tests


  Commit: e6d4bd712ba7a5ea49ec25842f8cf86836f41637
      https://github.com/zanata/zanata-server/commit/e6d4bd712ba7a5ea49ec25842f8cf86836f41637
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    A functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.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/WEB-INF/template/banner.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/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/help/edit_help_content.xhtml
    R zanata-war/src/main/webapp/help/view.xhtml

  Log Message:
  -----------
  Move help to zanata.org, updates on footer
https://bugzilla.redhat.com/show_bug.cgi?id=1195384

Squashed commit of the following:

commit 5c88b02048e58e3299be189a9d67c3dda096e8a3
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Feb 27 11:49:33 2015 +1000

    Add HelpPageTest to test plan

commit b5900f39f591acc3fcaebd52eb09039b9eb07afb
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Feb 27 11:41:19 2015 +1000

    Test for admin set help page

    Also fixes contact admin test due to removed Help page

commit 5b6630643dfab1e0d8133ea5d0b50e5ce157f135
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 25 14:50:58 2015 +1000

    Move help to zanata.org, updates on footer: https://bugzilla.redhat.com/show_bug.cgi?id=1195384


  Commit: 8dc9f6ceca14e9317da48f9041d5f6e51b307e36
      https://github.com/zanata/zanata-server/commit/8dc9f6ceca14e9317da48f9041d5f6e51b307e36
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    A etc/scripts/cargowait.sh
    A etc/scripts/functional-test-db-snapshot.sh
    A etc/scripts/standalone.cli.messaging.config
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    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/WebDriverFactory.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/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/EditRoleAssignmentPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R 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/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.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/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.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/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/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
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    R 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
    R functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M 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/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.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/editor/TranslateHTMLTest.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/editor/TranslationHistoryTest.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
    R 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/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M 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/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/project/EditWebHooksTest.java
    A functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.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/rest/CopyTransTest.java
    M 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/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.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/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.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/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    R zanata-dist/etc/assembly.xml
    R zanata-dist/etc/sql/config_setup.sql
    R zanata-dist/pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-model/src/test/resources/log4j.xml
    A zanata-overlay/.gitignore
    A zanata-overlay/build.gradle
    A zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    A zanata-overlay/common/bin/zanata-installer/install.bat
    A zanata-overlay/common/bin/zanata-installer/install.sh
    A zanata-overlay/common/bin/zanata-installer/installer.properties
    A zanata-overlay/config/remote-deps.groovy
    A zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    A zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.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/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/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/config/AsyncConfig.java
    A zanata-war/src/main/java/org/zanata/config/ConfigStore.java
    A zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.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
    A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.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/WebTransMessages.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/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.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/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.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/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/ksysv.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    R zanata-war/src/main/resources/images/openid/myopenid.png
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R 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/documents-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
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R 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
    R 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/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    R zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R 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/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/test/finished.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.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/version_group.xhtml
    M zanata-war/src/test/java/org/ForceLoadClass.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
    A zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    M zanata-war/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java


  Commit: 260dfa2fbc0de5500693bdc8b2b273084a77dadc
      https://github.com/zanata/zanata-server/commit/260dfa2fbc0de5500693bdc8b2b273084a77dadc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    R 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/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.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/WEB-INF/template/banner.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/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/help/edit_help_content.xhtml
    R zanata-war/src/main/webapp/help/view.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into cdi-prep

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


  Commit: 612ee5db075df5a7f90fd0ae39497c17bd86a509
      https://github.com/zanata/zanata-server/commit/612ee5db075df5a7f90fd0ae39497c17bd86a509
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java

  Log Message:
  -----------
  Fix FacesMessages display component specific message


  Commit: 89ce917d98d414fcc239cae5d9b3bb053d6dae95
      https://github.com/zanata/zanata-server/commit/89ce917d98d414fcc239cae5d9b3bb053d6dae95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java

  Log Message:
  -----------
  Fix saving server config event


  Commit: b81c7f04ba6a748681b28f1be2f1ba5620194c95
      https://github.com/zanata/zanata-server/commit/b81c7f04ba6a748681b28f1be2f1ba5620194c95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.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
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Implement email reasons for admin

https://bugzilla.redhat.com/show_bug.cgi?id=1197572


  Commit: d801ade2fa49c9c4981607e23aff4701c2464206
      https://github.com/zanata/zanata-server/commit/d801ade2fa49c9c4981607e23aff4701c2464206
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Remove reference of helpContent


  Commit: c4bf8e3088c481369ee03145f69045a07ff1bd9d
      https://github.com/zanata/zanata-server/commit/c4bf8e3088c481369ee03145f69045a07ff1bd9d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.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
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Merge pull request #706 from zanata/rhbz1197572

Implement email reasons for admin


  Commit: 4236d988e25e4e65de4044df1b3ad6fb7fdef29f
      https://github.com/zanata/zanata-server/commit/4236d988e25e4e65de4044df1b3ad6fb7fdef29f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

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

  Log Message:
  -----------
  Add plural forms for Sanskrit and Konkani


  Commit: 3572d8d8e54be1aeb07b40162b425ebf751b37f9
      https://github.com/zanata/zanata-server/commit/3572d8d8e54be1aeb07b40162b425ebf751b37f9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

  Log Message:
  -----------
  Update send email id to fix functional test


  Commit: ca23afa754d1533d709f6c4286e4b17b0f86a7e6
      https://github.com/zanata/zanata-server/commit/ca23afa754d1533d709f6c4286e4b17b0f86a7e6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Terms of use settings test


  Commit: 56ed1381417771e6fc6114fac243388c5bc72762
      https://github.com/zanata/zanata-server/commit/56ed1381417771e6fc6114fac243388c5bc72762
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

  Log Message:
  -----------
  Merge pull request #710 from zanata/fix-functional-test

Update send email id to fix functional test


  Commit: bcb2e36ef8cd3847b3f54836addcd07ec28d7d75
      https://github.com/zanata/zanata-server/commit/bcb2e36ef8cd3847b3f54836addcd07ec28d7d75
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    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/faces-config.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
    A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml

  Log Message:
  -----------
  Squashed commit of adding locale aliases and updating locale config tabs:

Squashed the following commits:

commit f89db686d7a9a0bcdd1965795cf35b4a7455f518
Author: David Mason <drdmason at gmail.com>
Date:   Wed Mar 4 10:27:52 2015 +1000

    Prevent superfluous update success messages

commit 65d9f6d9e7c75962ae8ce4032a22f591a0b16526
Author: David Mason <drdmason at gmail.com>
Date:   Wed Mar 4 10:23:06 2015 +1000

    Ensure that aliases can be removed when locales are inherited from the server.

commit 6bea61b88232e7a4c1167aaf22395d464c486efb
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 3 22:20:45 2015 +1000

    Ensure that removal of locale aliases works in all cases.

    Aliases were not being removed correctly when removing an alias should
    have caused a version to stop overriding the project locales.

commit dc01901aab5bf501f4c9775ca39950c1776bb9e2
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 15:29:23 2015 +1000

    Do not include locales in generated config file.

commit 5e58e90d520267b2ccb7b1d2cad7b00ccc199fa0
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 14:49:43 2015 +1000

    Show a single message when removing multiple locale aliases in version.

commit 3c86d09eac9a573ed25bb47f5723741d07bae1d1
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 14:27:34 2015 +1000

    Show a single message when enabling multiple locales in version.

commit 16279763d6e9cc87e525905e9c87c9a44b4c3e59
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 12:02:24 2015 +1000

    Show a single message for disabling multiple locales in a version.

    Also overrides updatedMessage() to prevent the printing of an unwanted
    "successfully updated" message.

commit 9806e3bb6493f9c8659091fa1b6534126e4aaefb
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 09:10:02 2015 +1000

    Show a single message when removing multiple locale aliases in project.

commit a87fadbe3c123f0c6fb050c2cf8897bd219b76fc
Author: David Mason <drdmason at gmail.com>
Date:   Sat Feb 21 23:07:06 2015 +1000

    Show a single message when enabling multiple locales in project.

    Also eliminates some repeated code.

commit 555214d6c9d314b4d7a12867f9e2f11693572b17
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 19:27:41 2015 +1000

    Show a single message when disabling multiple locales.

    Also changes the message for disabling a single locale, and arranges
    code in ProjectHome.

commit e4fa655e2b385d6660dd3cae6e8ab457dcb6e0a6
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 14:32:41 2015 +1000

    Move empty languages search message.

    Language search message was above the table, now moved below the table
    heading to appear where the search results would be.

    This also incluldes a style improvement on the empty search results
    message and on the messages about empty lists.

commit a7151d93e6658629d458b8387debf40d11689658
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 13:53:05 2015 +1000

    Change text on language inherit button for project-version.

    Was using text from project language settings, which was not a good
    match for the operation in version.

commit 6054a507ee7cb7cf632fb79c805dda6f21d7ee3c
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 13:38:06 2015 +1000

    Change headings in language settings to be consistent.

    There was a mix of terminology with "available", "enabled", "enable",
    "disable". Changed to use "enabled" and "disabled", "enable" and
    "disable" consistently.

commit a8cd77f61b34d091e61849ff1bf471e655ca85c4
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 12:12:00 2015 +1000

    Change locale alias tooltip to be more accurate.

    Previous tooltip did not indicate where the locale alias applies,
    and erroneously implied that the alias was interchangable with
    the standard locale code.

commit 62d38a91eea769c00d690fcc9241140d60071b06
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:57:50 2015 +1000

    Use standard function to detect enter key in project settings tab script.

commit 30410ccef14ed82422c18bd1a3631ea7866c16a4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:47:58 2015 +1000

    Move more language settings helper functions to components-script

commit 7a5e9df378a99b728822f7df99178b792f6123eb
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:18:32 2015 +1000

    Move more javascript form locale settings template to script file.

commit b07f562e5a207e23aee6cb30e6229c586b2fe50e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:17:12 2015 +1000

    Remove unused functions from language settings code.

commit 13a1a0d0e9a748ea165c55d36a8b94bfc3fccc9b
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 10:02:49 2015 +1000

    Move locale settings javascript to a separate script file.

commit c22a52ddc541f3ef9731cceb59b0dc0971f6344d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 09:36:26 2015 +1000

    Move language settings helper functions to components script.

commit 4cf44b9dd105d126950c876a672748d06dbf56c0
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:31:48 2015 +1000

    Extract isEscapeKey() function to components-script.js

commit c89199d47a6ba05e8d45fcc8292b90441b48c60e
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:07:45 2015 +1000

    Use function from components-script in project and version language settings.

commit fdd36b75a65fdf82e7b45e70f18d2a536e761b28
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:06:30 2015 +1000

    Refactor components-script.js

    The script had inconsistent use of semicolons, and some needless
    repetition which is better removed.

commit b81018847ebc03f4facba1909a6159a7f424a818
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 14:34:17 2015 +1000

    Prevent type coersion in components script.

    I found numerous uses of == comparison in components-script.js. Use
    of == is error-prone as it can coerce types implicitly, leading to
    unexpected results and unnoticed errors. Use of === is preferred for
    this reason.

commit e354027483bea14a4df9d5e35481789aacb9d95c
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 11:30:57 2015 +1000

    Only try to initialize entered locale aliases for existing versions.

    This was causing a null pointer exception when creating a new version,
    which does not need to use any of the locale functionality.

    The new-version template should really use a different action since
    its concerns are so much more limited than the version page.

commit fb17ceaf8bf384c7ead8e25d37f37000f287e5f2
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 16:06:55 2015 +1000

    Remove jsf-impl dependency.

    This was causing a dependency checker error, and removing it does not
    appear to cause any issues.

commit eaf0141c2a2f0a5e4a865c9c23cb8197d5f38ae1
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 15:27:35 2015 +1000

    Fix checkstyle violations.

commit 37bd7b3ed4a783ca94f3f2efb3f0ee75851cbdd1
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 13:40:23 2015 +1000

    Add REST endpoint for version locale list.

    Added a common parent for both the project and version locales endpoint
    to avoid duplicating the code for formatting the locale list response
    entity. This could have been done with a static method on one or the
    other class, or on a utility class. I may yet change to one of those
    approaches.

    Adds a helper method in LocaleServiceImpl to determine whether to get
    the project or version locale aliases, to be consistent with how the
    locale list is similarly differentiated.

commit 7c8f805d3405ee12ebdead2d85a8a3b7e324d59a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 09:58:40 2015 +1000

    Refactor project and version home actions.

    Just some renames, removal of dead code and preventing a few compiler
    warnings.

commit 48c58d97b31928ffedf3197fde2b874bc692fdaa
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 16:03:13 2015 +1000

    SQUASH: inline some stuff and remove some dead code

commit 88d6f1e4c3306ff1c47b9771d6686b65a2fd89d1
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 13:44:45 2015 +1000

    SQUASH: add restrictions and remove dead code

commit 5f018a8e88e82feff676fa9ef1a61b1fda8f35d8
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 12:27:06 2015 +1000

    SQUASH: getting overrides working properly for locales in VersionHome

    Yet to do:

     - success messages
     - security restrictions
     - variable for text on 'defaults' button
     - make sure values in API are consistent with UI
       (i.e. if !isOverrideLocales() use values from project).

commit 6ad0e68d43d09784ba223f83467359efa788a289
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 13 12:07:45 2015 +1000

    Implement HasLanguageSettings in VersionHome.

    Yet to add appropriate restrictions to all operations, or remove
    functions that are no longer called.

commit f5c802f9ff51673395bf75def1a0b230c98a38c9
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 14:04:52 2015 +1000

    Cleanup markdown for project language settings.

commit 2c8303cf020ebcf53ef2c02db04bd98c1de1aa04
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 09:54:09 2015 +1000

    SQUASH: just adding settings-tab-languages and importing it.

commit 80ce815a0c9dd20a8beb0362bb459f6d6b055182
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 09:52:39 2015 +1000

    OVERWRITE: just stubs of HasLanguageSettings in VersionHome.java

commit 8f5551e60126e49933df9917423e497deb5abac2
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 11 14:00:10 2015 +1000

    SQUASH remove use of instance

commit 03a8fda447839703167223831d6f42485f786939
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 11 13:31:46 2015 +1000

    Add interface for language list settings backend.

    The interface is not strictly necessary at this point, but it provides
    a compile-time check that an action bean provides everything needed by
    the template, rather than having to deal with runtime errors.

    The interface can also provide a basis for splitting the language
    settings code into separate classes to reduce duplication and move
    closer to a single responsibility per class.

commit 69b5a30bfe7900905ddca88578016112b9512d9d
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 15:42:43 2015 +1000

    Refactor methods in projectHome to be consistent.

    Mainly renaming, with a little tweaking of parameters.
    This change is in preparation for defining a sensible
    interface for language settings interactions.

commit 25a8206b29b7368e408b030f6a40831212c85597
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 14:42:22 2015 +1000

    Add hasLocaleAlias to project home.

    This allows some less semantically meaningful EL expressions to be
    replaced.

commit d1cee94766b7e89cab7a901d226b53dc8e6c3168
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 12:48:05 2015 +1000

    Add override locales property to projectHome.

    The overrideLocales property was being accessed indirectly in several
    locations and from the JSF template. By making it a direct property
    some duplication is removed and the interface to support language
    settings is simplified.

commit 2c3f70279030329bc7de25ae8902a5709c26d69f
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 12:38:57 2015 +1000

    Add locale aliases property to projectHome.

    The locale aliases were being accessed indirectly on the JSF page,
    which complicated the interface for language settings. This change
    simplifies the interface for supporting language settings.

commit f2a560d0a47fcad8ed88a18e172148f523555a7d
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 15:49:30 2015 +1000

    Use translatable string for language enable button text.

commit 4da24e05db90d1e5e37c768cdcc65fa29514b3d2
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 15:14:05 2015 +1000

    Close the locale edit form when the user presses Escape.

commit 0ba1fbfe59b9ff0c2986d7128cc25d9f435f2800
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 11:54:46 2015 +1000

    Show messages when locale aliases are modified.

    This includes when a locale alias is added, changed or removed,
    and when aliases are removed in bulk operations.

commit c4eb669914a0bfc0f6eb7df97c9e7a2a4f70bc6e
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 11:14:22 2015 +1000

    Show messges when languages are added or removed.

commit 4c15332488a7186813941c6f3ad5a6816f198771
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 15:28:09 2015 +1000

    Move language lists to separate file.

    This moves the main content of the language lists to a separate file
    with the language list filter and other related components.

    The language-list-specific scripts are not yet moved to the separate file.

commit 0615a6e141b5d078c0437936930a81cf72040496
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 12:24:01 2015 +1000

    Move empty language list placeholder to separate file.

    This removes more duplication from settings-tab-languages.xhtml

commit e1848fa4ac3be12d6026813809e377620d8b6347
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 11:51:57 2015 +1000

    Move language list headings and filters to separate file.

    Initial step in removing duplication in language lists.

    Some parameters will become unnecessary when the lists themselves are moved
    into the language list file.

commit e1ed5a658f75815cf7d656ccb2a383472d37b79d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 16:56:04 2015 +1000

    Move project settings languages tab to separate code file.

commit d35ecabe08f3762d34e54cc9528739b6152241dc
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 16:15:06 2015 +1000

    Remove unused buttons for filter textbox clearing

commit d5bbf053a0a2247db280c0526174bb7396421eb7
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 13:02:13 2015 +1000

    Ensure that non-typed changes to filter text trigger filter.

    Changes such as cut or paste with the mouse or drag-and-drop were not
    triggering filter, since they do not involve a key press. The event
    'oninput' appears to be designed for exactly our purpose: to respond
    to changes in input text value regardless how the value was changed.

    Includes a fallback to respond to typing for browsers that do not
    support 'oninput'.

commit 05e91a7586ce9674f94ff2a819bb40d074436f33
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 17:09:06 2015 +1000

    Ensure locales are enabled when their enable button is clicked.

    This fixes a couple of bugs:

     - The wrong variable was being used, so that locales were not added
    when the enable button was clicked.
     - There was a mistake in how custom locales were initiated when going
    from global default locales to a custom list - the wrong method was
    used so that all locales were added, rather than just the
    enabled-by-default locales.

commit da25b8987fe52b2277cb20b97f83ee206b4bb857
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 16:33:48 2015 +1000

    Ensure list operations are visible when appropriate.

    It was possible to have a language selected in one of the language
    lists, but not see the available operations. This was caused when
    the lists and buttons are updated by ajax but the button visibility
    code has not run. Fixed by triggering a change event on the two
    lists, which causes button visibility to be evaluated and updated.

commit 493f26813146d00d43ee2d3d611db005a46c55ac
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 16:01:35 2015 +1000

    Filter available locales in the browser.

    This replaces the ajax-based filtering, which had high latency and cleared
    selections.

    This also replaces some optional rendered elements with always-rendered
    elements that are sometimes hidden, so that events can be properly attached.

commit 958d5f5224dd49adebdbb1b1866324f86834fae2
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 17:03:53 2015 +1000

    Move language list UI refresh script to end of language list panel.

    The script is placed at the end of the panel so that it will run after the DOM
    for the panel has been built, so all elements will definitely be available.

    The target element for the checkbox refresh is also changed to be the entire
    panel, since it was missing the select-all checkboxes when being run on only
    the two lists separately.

commit dcf9dce3c70c94245ed28503ba45ec0d1815c024
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 16:53:24 2015 +1000

    Move checkbox reload script to end of reloaded panel.

    This is necessary to ensure that all checkboxes have their facades
    properly refreshed. In the previous position it was missing the
    select-all checkboxes. This is probably also because the selector
    was too specific, specifying only the language items rather than the
    whole area.

commit c1e687b9e52314d7b2ed3af72400ce9107b5412f
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 12:41:42 2015 +1000

    Filter active locale list as filter text changes.
   This performs a 'live' filter which shows and hides locales in the active list
  as the user types in the filter textbox.
  A placeholder message is shown when no items match the filter text.
   The selection state of each language is maintained when it is hidden. This is
  done on purpose since we considered it better for usability if a language is
  not de-selected unless the user performs an operation that visibly de-selects
  it. This was a little complicated since hidden rows should not be treated as
  selected when they are submitted, and I was not able to clear their selection
  state on submit. Instead, when a selected row is hidden, I clear the check
  state and add the data 'checked-when-visible=true' to the checkbox element. When
  a row is shown and the data is present, the check state is restored and the
  data is cleared.

commit 66fcdca7f6d202efd828f284d93ce1800a57a625
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 15 15:12:57 2015 +1000

    Add component for select all checkbox functionality.

commit 237d9a250ab15581d3583ba4215d21a877b8b41a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 15 13:52:46 2015 +1000

    Add improvements for language project settings page.

commit 6a87a2a9e8308bc11748fe3289a888223ba3a562
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 16:31:23 2015 +1000

    Improve text search component to use newest assets script.

commit 601adede3b1e3ea081a7d22cd7b98bb0d301b9e7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:50:18 2015 +1000

    Finish reworking the locale selection screen.

commit 4ce8df997d5e225667b31e681cc7d69f12a1857d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:49:30 2015 +1000

    Use the new text input component and renderer.

commit 9eb079049c5855c49e01e7c6d25a9ad658fa0fc6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:46:38 2015 +1000

    Add a custom Ajax search component.

    This component allows triggering a JSF action and refreshing an area for performing searches.

commit 372f1694732bb9b9e69140d9466b2838d8f26603
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:45:21 2015 +1000

    Add a custom input text component.

    Override the default JSF text input renderer so that it allows for extra attributes (placeholder is the only supported extra attribute at this moment)

commit d11b1957e157a012c4ae7ae49788a0011bb4df7d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 8 11:50:07 2015 +1000

    Finish add and remove language functionality.

commit 3a1371cf8e595607dda115229d3e86cd33a35bbc
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 8 10:56:41 2015 +1000

    Create new command button custom component.

    This custom component behaves the same as a4j:commandButton, but it's rendered as an html button instead of a link or input element.

commit 6d43203eda7c78bb05421254f535d2289e033c52
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 6 16:42:07 2015 +1000

    Add a custom component for ajax buttons.

    These new components will take care of rendering a loading indicator as well as offer additional options.
    This initial implementation has the very basic options to generate a command link.
    Note: This initial implementation uses JQuery id selectors, which might make it less efficient than other options.

commit 704eb7efe09eef827ad22a90ab40ca02966bd47a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 6 13:53:13 2015 +1000

    Add a custom component for ajax links.

    These new components will take care of rendering a loading indicator as well as offer additional options.
    This initial implementation has the very basic options to generate a command link.

commit bcbaf5083e30c8ed3a2808cf8a5dcffe526d47b8
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jan 4 21:40:13 2015 +1000

    BROKEN: attempting to get selection checkbox state visible from ProjectHome

commit 6f11407e89c89b861f78ee530fabd4551d975e3d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 15:35:16 2014 +1000

    WIP: the delete alias button works now

commit e11f4e758d85dafe684ee3f7798ef878495472db
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 15:25:07 2014 +1000

    WIP: disable button is working

commit 8fc00dbd0ef1210a4ebc0e7f44c31682639f5143
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 11:28:10 2014 +1000

    SQUASH: cleaned up and made sure checkboxes come back on refresh

commit da4eb992397fa2fc3db7c488e7991dbc74a893b8
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 10:46:23 2014 +1000

    WIP, CLEANUP: select-all checkbox working

commit 8259d0f4bf9a003b493066e4d6f6d77bb471b225
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 18:43:40 2014 +1000

    WIP: did big cleanup on the new script, should be good now. Still should check for those now-unused classes in the elements

commit 7dd248d83a6e559a3587ebb5b77760588ee3a268
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 14:00:25 2014 +1000

    WIP, CLEANUP: working toggle display of buttons and headings on active locales list

commit 6d833fac1ff8b4f650b8c37b78f95b4c8eac75e7
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 13:48:46 2014 +1000

    WIP: script is successfully triggering recheck, just that recheck seems to do nothing

commit 0230642622c169ba80827ca4c85c5e18e9a18770
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 12:23:18 2014 +1000

    WIP: wrap final column of enabled languages properly

commit 30a3a95200bb0568efa90bd9eb9bced21c2f602a
Author: David Mason <drdmason at gmail.com>
Date:   Mon Dec 22 15:02:38 2014 +1000

    WIP: show loader and cancel button, move alias input to new layout, remove old layout for enabled languages

commit cb176b916c532fe0715f6c242865cdfac3aebbd3
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 14:50:34 2014 +1000

    WIP: show and hide inline buttons on enabled languages at appropriate times

commit c7b4e34804af171edf3c390f9ff3f5d50c8387cb
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 12:40:54 2014 +1000

    WIP: implementing new design for project language settings tab

commit d8d81d36236e3d79d8d12df1a340ef983c90550a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 11:24:14 2014 +1000

    Update to assets version needed for project language settings page

commit 7536e00a9bc09ec36643af52a57c5cfdcefd7e9a
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 17 17:12:06 2014 +1000

    Change label on button for using server default languages in a project

commit 37307a28fd8b982ba67e01b1c6a0a5fa96b2416c
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 9 18:29:02 2014 +1000

    Add REST endpoint for project locales

commit 062262cb7ffab2d989038284814438ef69914378
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 11 16:39:17 2014 +1000

    Show and set locale alias on project settings page.

     - Displays alias next to the locale id if it exists.
     - Adds a dropdown menu with option to add a locale alias.
     - Adds a hidden inline form to add a locale alias, shown when the menu
       option is selected.

commit 0f395ffdda8100e11eb1dc3c897f3a3d6bfbdee3
Author: David Mason <drdmason at gmail.com>
Date:   Fri Dec 5 11:40:21 2014 +1000

    Add locale aliases to HProjectIteration

commit f4d444a0e98065ec90cdfde9199ee8e8a4b8156e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 4 14:23:35 2014 +1000

    Add locale aliases to HProject

    Adds join table to map locale id to alias string for a project id,
    and updates hibernate entity HProject to use the join table.


  Commit: 45f7a22b4531bf33124a1862460790f2471e7f7d
      https://github.com/zanata/zanata-server/commit/45f7a22b4531bf33124a1862460790f2471e7f7d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.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
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Merge branch 'master' into cdi-prep


  Commit: ed0ebdb26f75f22b559dbf3f5e9288d26643e24b
      https://github.com/zanata/zanata-server/commit/ed0ebdb26f75f22b559dbf3f5e9288d26643e24b
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Ensure that a success message is shown when project about page is updated.


  Commit: bd37a83aeccb5e3f416a5a8f0af5f48fa650f8f9
      https://github.com/zanata/zanata-server/commit/bd37a83aeccb5e3f416a5a8f0af5f48fa650f8f9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #708 from zanata/help-terms-tests

Terms of use settings test


  Commit: 13498ffe650837ab0c06df992f5cc34ec5ce0d45
      https://github.com/zanata/zanata-server/commit/13498ffe650837ab0c06df992f5cc34ec5ce0d45
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #709 from zanata/sa-kok-plurals

Add plural forms for Sanskrit and Konkani


  Commit: c2d1a43810c0923a94a80ef478464e0b2cbe325c
      https://github.com/zanata/zanata-server/commit/c2d1a43810c0923a94a80ef478464e0b2cbe325c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Fix language tests

Significant changes to language add/remove behaviour in projects.
Moves the test page behaviour to a utility class, as it is shared in
project and version settings.


  Commit: cadeb3d6746d6062780b643f33426b82a48f44dd
      https://github.com/zanata/zanata-server/commit/cadeb3d6746d6062780b643f33426b82a48f44dd
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #713 from zanata/fix-about-message

Ensure that a success message is shown when project about page is updated


  Commit: ec98f244205d9688ed7c8ba904704c7d24c4cf5f
      https://github.com/zanata/zanata-server/commit/ec98f244205d9688ed7c8ba904704c7d24c4cf5f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Merge pull request #707 from zanata/remove-help-content-reference

Remove reference of helpContent


  Commit: 5944a6185c705f80655cee3ee93eae922a448be8
      https://github.com/zanata/zanata-server/commit/5944a6185c705f80655cee3ee93eae922a448be8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/configuration/wildfly.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    A mkdocs.yml

  Log Message:
  -----------
  Move documentation to readthedocs.

Move User and Admin manual type documentation to the repository to be built by readthedocs.


  Commit: 979007ba459a36805ef60915630454a0b972e81e
      https://github.com/zanata/zanata-server/commit/979007ba459a36805ef60915630454a0b972e81e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/release-notes/release-notes-3.3.2.md
    A docs/release-notes/release-notes-3.4.md
    A docs/release-notes/release-notes-3.5.md
    A docs/release-notes/release-notes-3.6.md
    M mkdocs.yml

  Log Message:
  -----------
  Add release notes to the docs.


  Commit: ccf09ebaf53b7d920d53977bb49bd18070d17366
      https://github.com/zanata/zanata-server/commit/ccf09ebaf53b7d920d53977bb49bd18070d17366
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M docs/configuration/jms-messaging.md
    R docs/configuration/wildfly.md
    M docs/user-guide/Opening-a-Translation-Project.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/create-version.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/upload-strings.md
    M mkdocs.yml

  Log Message:
  -----------
  Documentation fixes.

A few incorrect URLs, and some formatting fixes.


  Commit: 069f6778b461c58533b668afd1d0b0caac5520db
      https://github.com/zanata/zanata-server/commit/069f6778b461c58533b668afd1d0b0caac5520db
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/release-notes.md
    R docs/release-notes/release-notes-3.3.2.md
    R docs/release-notes/release-notes-3.4.md
    R docs/release-notes/release-notes-3.5.md
    R docs/release-notes/release-notes-3.6.md
    M mkdocs.yml

  Log Message:
  -----------
  Move release notes to a single page.


  Commit: 99d5123707fcdc896ca2dedfa249670ce8b65551
      https://github.com/zanata/zanata-server/commit/99d5123707fcdc896ca2dedfa249670ce8b65551
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/release-notes.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    A mkdocs.yml

  Log Message:
  -----------
  Merge pull request #712 from zanata/readthedocs

Readthedocs


  Commit: 0aadf8c74996d65671aef970dc0513f444aaebc8
      https://github.com/zanata/zanata-server/commit/0aadf8c74996d65671aef970dc0513f444aaebc8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

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

Fix language tests


  Commit: 69ecd10df6e387427c4cc2e5252dd02b73768674
      https://github.com/zanata/zanata-server/commit/69ecd10df6e387427c4cc2e5252dd02b73768674
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Add test for setting a project language alias


  Commit: 0027ae71c4187f8b41119c23a5da1c5b1dffb84e
      https://github.com/zanata/zanata-server/commit/0027ae71c4187f8b41119c23a5da1c5b1dffb84e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #715 from zanata/alias-lang-test

Add test for setting a project language alias


  Commit: 1bab304606750c485c662e6c2d320d3428d4f9b9
      https://github.com/zanata/zanata-server/commit/1bab304606750c485c662e6c2d320d3428d4f9b9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  Wait for page silence before and after login


  Commit: 88baf2b754890f1b2248ff21d475a06d84030760
      https://github.com/zanata/zanata-server/commit/88baf2b754890f1b2248ff21d475a06d84030760
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Reduce unnecessary log warnings


  Commit: f66cff370768e87f71e37b4a0e5c6ffca37562fd
      https://github.com/zanata/zanata-server/commit/f66cff370768e87f71e37b4a0e5c6ffca37562fd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #711 from zanata/wait-around-login

Wait for page silence before and after login


  Commit: 5cf48725f04f8cfb1014daf92babf5ad1ea7187e
      https://github.com/zanata/zanata-server/commit/5cf48725f04f8cfb1014daf92babf5ad1ea7187e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  Skip some notifications which have regressed

Error recorded in RHBZ1199852


  Commit: d97eee2537bf1010e46fd21a3c41086fabb63565
      https://github.com/zanata/zanata-server/commit/d97eee2537bf1010e46fd21a3c41086fabb63565
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #718 from zanata/skip-broken-notifications

Skip some notifications which have regressed


  Commit: 9c0e238fb711bbb0fd0f3236f1bde443bbef678e
      https://github.com/zanata/zanata-server/commit/9c0e238fb711bbb0fd0f3236f1bde443bbef678e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update classloader-leak-prevention to 1.12.0


  Commit: 17bcbceda57298472cbe470b0d153b528a621023
      https://github.com/zanata/zanata-server/commit/17bcbceda57298472cbe470b0d153b528a621023
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/release-notes.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.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/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.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/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java
    A mkdocs.yml
    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/HProjectIteration.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/ApplicationConfigurationAction.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.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/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.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/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/urlrewrite.xml
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/help/edit_help_content.xhtml
    R zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
    A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

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


  Commit: f6bd5b2a61a358a907c8a0fa16d7be3566d60325
      https://github.com/zanata/zanata-server/commit/f6bd5b2a61a358a907c8a0fa16d7be3566d60325
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix maven validation problems.


  Commit: 6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
      https://github.com/zanata/zanata-server/commit/6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

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

  Log Message:
  -----------
  fail fast if jms is not configured properly


  Commit: 895a90e27e66c55c861ee3bf8a95a25b4debad64
      https://github.com/zanata/zanata-server/commit/895a90e27e66c55c861ee3bf8a95a25b4debad64
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Administration page settings tests


  Commit: 2838bcf20d960ce9c8153a4ffed64c670328cef3
      https://github.com/zanata/zanata-server/commit/2838bcf20d960ce9c8153a4ffed64c670328cef3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge pull request #722 from zanata/admin-page-tests

Administration page settings tests


  Commit: e02cd00544f3f92f4168b80a611000d980f4ec2e
      https://github.com/zanata/zanata-server/commit/e02cd00544f3f92f4168b80a611000d980f4ec2e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java

  Log Message:
  -----------
  Correct checkstyle errors


  Commit: b2e94a8e847f6dee74bb1ce116b394bce3813134
      https://github.com/zanata/zanata-server/commit/b2e94a8e847f6dee74bb1ce116b394bce3813134
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/release-notes.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.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/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A mkdocs.yml
    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/HProjectIteration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.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
    A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
    A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

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


  Commit: 38cab87c6daee3f3e1230a0ffbfc21d9f153927f
      https://github.com/zanata/zanata-server/commit/38cab87c6daee3f3e1230a0ffbfc21d9f153927f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M docs/release-notes.md
    M mkdocs.yml

  Log Message:
  -----------
  Activate Infinispan configuration documentation.


  Commit: 1c0294e98365ebcb41e4fc2ef603037cbc203ee2
      https://github.com/zanata/zanata-server/commit/1c0294e98365ebcb41e4fc2ef603037cbc203ee2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

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

  Log Message:
  -----------
  Enable reset of the from email and loglevel config options under test


  Commit: 72a6b50b33e77757c9c46a6016e11669332b5c80
      https://github.com/zanata/zanata-server/commit/72a6b50b33e77757c9c46a6016e11669332b5c80
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Add Infinispan configuration to all standalone.xml instances.


  Commit: e635b29ddd26ef6ec68d181579df73282089c9b4
      https://github.com/zanata/zanata-server/commit/e635b29ddd26ef6ec68d181579df73282089c9b4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #723 from zanata/allow-logging-config-reset

Enable reset of the from email and loglevel config options under test


  Commit: 76edc6c519aaf5e718f919d73e69472c4f46131b
      https://github.com/zanata/zanata-server/commit/76edc6c519aaf5e718f919d73e69472c4f46131b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

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

  Log Message:
  -----------
  rhbz1201080 - when server url is set to empty, it will not reuse previous set value


  Commit: 31ef41ad9828762e7bfb562de6e24e99719a0432
      https://github.com/zanata/zanata-server/commit/31ef41ad9828762e7bfb562de6e24e99719a0432
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  change link in language team permission change email template since we don't have that page anymore


  Commit: 8769ce18cdeda8318c6474a6aa0144f38e015add
      https://github.com/zanata/zanata-server/commit/8769ce18cdeda8318c6474a6aa0144f38e015add
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #725 from zanata/fix-servr-url-bug

Fix servr url bug


  Commit: 5decdf0ae1656a341f9cc634a0d001b188ae24df
      https://github.com/zanata/zanata-server/commit/5decdf0ae1656a341f9cc634a0d001b188ae24df
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M docs/release-notes.md
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.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/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.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/java/org/zanata/util/ServiceLocator.java
    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
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #577 from zanata/infinispan

Introduce Infinispan as cache and hibernate back-end

Full functional tests passed. Not attempting a squash merge.


  Commit: b919e90ea615e2443c687216d85934982fc44a7b
      https://github.com/zanata/zanata-server/commit/b919e90ea615e2443c687216d85934982fc44a7b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #720 from zanata/update-leak-prevention

Update classloader-leak-prevention to 1.12.0


  Commit: baef61afe74989d5e2970700c6e10fcfb6efddfb
      https://github.com/zanata/zanata-server/commit/baef61afe74989d5e2970700c6e10fcfb6efddfb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #717 from zanata/reduce-logging

Reduce unnecessary log warnings


  Commit: d302e683430b5ecd2ee98279f02ed4b711f04516
      https://github.com/zanata/zanata-server/commit/d302e683430b5ecd2ee98279f02ed4b711f04516
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.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/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-war/pom.xml
    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:
  -----------
  Move back to Ehcache for hibernate 2nd level cache.

At least until a solution is found in terms of compatibility between Wildfly (hibernate 4.3, infinispan 6) and EAP (hibernate 4.2, infinispan 5).
Other data caches will still use infinispan.


  Commit: 541fc6c7f37e73a11b23e5c30f8a178d497118a8
      https://github.com/zanata/zanata-server/commit/541fc6c7f37e73a11b23e5c30f8a178d497118a8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.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/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-war/pom.xml
    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:
  -----------
  Merge pull request #730 from zanata/revert-hibernate-infinispan

Move back to Ehcache for hibernate 2nd level cache.


  Commit: d0b3c45f212b5c7841f1e414e3b807cd9551573e
      https://github.com/zanata/zanata-server/commit/d0b3c45f212b5c7841f1e414e3b807cd9551573e
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md

  Log Message:
  -----------
  Remove some mentions of Hibernate in the docs caches' section.


  Commit: 7f16400f2379acab61ee3af5a0ac990729d9408c
      https://github.com/zanata/zanata-server/commit/7f16400f2379acab61ee3af5a0ac990729d9408c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md

  Log Message:
  -----------
  Merge pull request #731 from zanata/docs-cache-update

Remove some mentions of Hibernate in the docs caches' section.


  Commit: 649a824cb6c6509f75c0b1d0c639be78dbc433b3
      https://github.com/zanata/zanata-server/commit/649a824cb6c6509f75c0b1d0c639be78dbc433b3
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/authentication.md
    A docs/configuration/installation.md
    A docs/images/project-view-versions.png
    A docs/images/version-view-languages.png
    A docs/user-guide/projects/project-view.md
    A docs/user-guide/versions/version-view.md
    M mkdocs.yml

  Log Message:
  -----------
  Documentation imprevovements.

See Pull Request: https://github.com/zanata/zanata-server/pull/729

Squashed commit of the following:

commit 28f03c1b70c2f4cdeb44a150efb4adb1fefb7885
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Mon Mar 16 08:46:13 2015 +1000

    Documentation spelling errors and other review comments.

commit 2e2bca41c0aef40cd3ab9c3b0d77cc3111f567c1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Mar 12 14:25:36 2015 +1000

    Add installation documentation.

commit add05845332b31b88a1e2158b68169ceb7a45200
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Fri Mar 6 17:49:08 2015 +1000

    Add a project and version view sections.


  Commit: 4ea3f29b862bbe4bf08a12bec629f7aecf43b7f2
      https://github.com/zanata/zanata-server/commit/4ea3f29b862bbe4bf08a12bec629f7aecf43b7f2
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  rhbz1194543 - change resId for plaintext and libreoffice to be content hash.

Closes #724

Squashed commit of the following:

commit 4eb3604690c332cd3c1af961b47eceb2f1f67fef
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 17 12:47:40 2015 +1000

    Add timeout requirement to release notes.

    Testing found that the server can timeout during startup if there is
    enough data to migrate, so it may be necessary to increase the server
    startup timeout in the server configuration. This is now documented.

commit 7e4b1de3dde5e6096f3cf87e7a6800cce34ce652
Author: David Mason <drdmason at gmail.com>
Date:   Mon Mar 16 13:57:17 2015 +1000

    Improve logging during id migration from positional to hash-based.

commit bcc5dfb267c1745e996dab874333294e1f2c3150
Author: David Mason <drdmason at gmail.com>
Date:   Fri Mar 13 10:17:04 2015 +1000

    Add release notes entry for using content hash for text document id

commit 74934bcb1a4ab025cff5fe7da08f947b310715a4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:57:29 2015 +1000

    Use try-with-resources for prepared statements when migrating resId from positional to content hash

commit f71d9cb82fa1c7cfa031a3e64b9b90612397397e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:33:13 2015 +1000

    Add warning note to some text unit id sources

commit 674f99cd26ca972a3be60df32a627c1023fdc486
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 10 13:23:47 2015 +1000

    Change resId for plaintext and libreoffice to use content hash.

    This includes migration of resId in all existing documents of
    the above types to be the content hash.


  Commit: bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
      https://github.com/zanata/zanata-server/commit/bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    A docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-dialog.png
    A docs/images/version-merge-trans-progress.png
    A docs/images/version-more-action-menu.png
    M docs/release-notes.md
    A docs/user-guide/merge-translations.md
    M mkdocs.yml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Implement merge translation from existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989

Squashed commit of the following:

commit 59b3e0449a48abbdb76929534a26ea9a045bf790
Merge: 7f09ae2 4ea3f29
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 15:47:28 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

    Conflicts:
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

commit 7f09ae2a06aa02c9a942597215170f7a4a8481c7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 13:51:51 2015 +1000

    Limit to maintainer's projects to merge from in UI.

commit 2e96c942b4f2fd71dea8fd5f6725c40d09116cf9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 16:09:57 2015 +1000

    Disable merge button if there's no version available to copy

commit 8be5f3606c74ffbf7532dd92524b28c5d7684f74
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 13:07:07 2015 +1000

    Update docs printscreen and messages

commit f8680c0263d19b916850b612f669e15c2906c88c
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 11:23:42 2015 +1000

    Add docs for merge-trans feature

commit 1b6e2b2a6c48d18984153cf491edcab470c429f3
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 06:43:19 2015 +1000

    Fix unit test

commit 4e7d7bebc74c88a98dffbfc1d9f29cb07239df04
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:43:26 2015 +1000

    Fix load source versions for merge trans dialog

commit 9e7c75df3d7e96df1106b52a4150a6696e395fb9
Merge: f7eaffb 541fc6c
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:23:55 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

commit f7eaffb27a1def5a427865cd3fb08e53951a197d
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:21:10 2015 +1000

    Refactor and changes on PR review

commit 6d4c388833248785d3b19da52a0bc35d9b65ff00
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 16:38:32 2015 +1000

    Fix unit test

commit 032013279dfaa040571b46b1ebb2eb821bab2820
Merge: f0419d1 baef61a
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:59:58 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

commit f0419d1e34877b75d82f12ded3fc2ff0427662b7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:29:04 2015 +1000

    Fix checkstyle

commit 16d58ba99edbf748ae3e59b670e9b53984cf5c1c
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:10:15 2015 +1000

    Fixed project selector issue for merge trans

commit 5d1ce6f68ab50f01da3af966d688bf48efee5853
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 12 15:57:35 2015 +1000

    WIP: implement project selector for merge translation dialog

commit fa50a891bc03a86ac5677735d24109ac243dcd75
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 12 14:09:04 2015 +1000

    Refactor query, UI and test

commit 43e9f0736fa4b68bd0cedbb829d068502c14661c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 11 18:32:42 2015 +1000

    Fix preload of progressBar component

commit 43bf35defdce8f9884c9a2cfff4ed9b0fc3b72b0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 11 16:02:20 2015 +1000

    Rename js name unique

commit d42b55873f4eba08708f4bdcaaccf2d43880a743
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 10 15:57:38 2015 +1000

    Create loading component for copy actions

commit 511ed109830792cd98df57415a829b0a761c4380
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 10 15:26:42 2015 +1000

    Create modal for merge-trans operations from version page

commit c05f4e6d1cda679ef926ed1b5b4b795b787243aa
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 9 15:13:12 2015 +1000

    Add unit test, fix shouldMerge to check for same content

commit b8065176d8d69f506cbe9ef0a7ef3a2c04a8c270
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 6 16:34:55 2015 +1000

    WIP: add unit test for merge translation

commit f8705176892deca12f548c33f47202eab9074dce
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 6 11:10:21 2015 +1000

    Add unit test for merge translations

commit fd06390f48f423b6d1ab4d9a4fc7c52c0d4cf156
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 5 15:38:07 2015 +1000

    Work in progress: add time log

commit 16b295dbc94eaa458c63b94d86b78f2f199ac122
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 5 15:04:49 2015 +1000

    Implement merge translation from and to existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989


  Commit: 2f98a27637fad17711fc57b97149d5182e157e71
      https://github.com/zanata/zanata-server/commit/2f98a27637fad17711fc57b97149d5182e157e71
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1183994 - create DAO query to query user matrix for date range


  Commit: 49f1d622822c408ff1d186621e9ec85eb728599c
      https://github.com/zanata/zanata-server/commit/49f1d622822c408ff1d186621e9ec85eb728599c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  move StatisticsServiceImpl to rest service package


  Commit: 2baee3a62737459b9e092afa7baabbbb1356fd3d
      https://github.com/zanata/zanata-server/commit/2baee3a62737459b9e092afa7baabbbb1356fd3d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  rhbz1183994 - add REST api for user matrix stats


  Commit: cb0cac8e34a4b99274bfadf1bfbb7721a6465c11
      https://github.com/zanata/zanata-server/commit/cb0cac8e34a4b99274bfadf1bfbb7721a6465c11
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java

  Log Message:
  -----------
  rhbz1183994 - refactor dto


  Commit: 74a183b7ff7d98330e21a1337311294da4c0b180
      https://github.com/zanata/zanata-server/commit/74a183b7ff7d98330e21a1337311294da4c0b180
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M etc/scripts/cargowait.sh

  Log Message:
  -----------
  change cargowait script


  Commit: 38a9447758ff5ecbbf3d251255cfea399cc8cbc5
      https://github.com/zanata/zanata-server/commit/38a9447758ff5ecbbf3d251255cfea399cc8cbc5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1183994 - remove table and use live query only


  Commit: 21f03e6f03e622ff6705b96c420ccf673d9db9b0
      https://github.com/zanata/zanata-server/commit/21f03e6f03e622ff6705b96c420ccf673d9db9b0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java

  Log Message:
  -----------
  rhbz1183994 - convert timezone in query so the group by column value is correct


  Commit: da6345f21587b1a98fe97d2e65e1aac2ec1d1bcc
      https://github.com/zanata/zanata-server/commit/da6345f21587b1a98fe97d2e65e1aac2ec1d1bcc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java

  Log Message:
  -----------
  rhbz1183994 - refactor to return a list


  Commit: 7332f5021e6269e80b847c9a5790e158e368ae60
      https://github.com/zanata/zanata-server/commit/7332f5021e6269e80b847c9a5790e158e368ae60
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.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/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

  Log Message:
  -----------
  rhbz1183994 - add user profile page and enable username search


  Commit: 14d2ba86b574dab9689e6124a5ab64a64dd6521a
      https://github.com/zanata/zanata-server/commit/14d2ba86b574dab9689e6124a5ab64a64dd6521a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java

  Log Message:
  -----------
  make search username case insensitive


  Commit: 96c186172789f15589cc173b622bdea90ae5bef1
      https://github.com/zanata/zanata-server/commit/96c186172789f15589cc173b622bdea90ae5bef1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  rhbz1183994 - add to release note


  Commit: 697b4c6caff10b45519c24a646e4ed9bfe33422e
      https://github.com/zanata/zanata-server/commit/697b4c6caff10b45519c24a646e4ed9bfe33422e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  rhbz1183994 - reduce the chance of user crashing server log


  Commit: da5ac91605ccb357f9d1ea6d0907f7ee29b11cfe
      https://github.com/zanata/zanata-server/commit/da5ac91605ccb357f9d1ea6d0907f7ee29b11cfe
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  rhbz1183994 - add index on lastModifiedBy column and fail on invalid timezone


  Commit: 01dfdf026f9368b90802d03c174e16624790e012
      https://github.com/zanata/zanata-server/commit/01dfdf026f9368b90802d03c174e16624790e012
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    A docs/user-guide/user-profile.md
    M mkdocs.yml

  Log Message:
  -----------
  rhbz1183994 - add basic doc


  Commit: 7440fcaa577c7c58b8ac041168c4a118bdbac6c3
      https://github.com/zanata/zanata-server/commit/7440fcaa577c7c58b8ac041168c4a118bdbac6c3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

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

  Log Message:
  -----------
  fix issues


  Commit: ed95b1878c10825a72045e72b251024381feb140
      https://github.com/zanata/zanata-server/commit/ed95b1878c10825a72045e72b251024381feb140
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #721 from zanata/fail-fast-jms

fail fast if jms is not configured properly


  Commit: e78c4976616498dc57a2b1684388121ab53aa39f
      https://github.com/zanata/zanata-server/commit/e78c4976616498dc57a2b1684388121ab53aa39f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    A docs/user-guide/user-profile.md
    M etc/scripts/cargowait.sh
    M mkdocs.yml
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #694 from zanata/rhbz1183994-user-stats

Rhbz1183994 user contribution matrix


  Commit: b021f28b7ebb455d092aff96420d038a97409ae1
      https://github.com/zanata/zanata-server/commit/b021f28b7ebb455d092aff96420d038a97409ae1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Bug 1066780 should be in asset, not part of 3.6

* [1066780](https://bugzilla.redhat.com/show_bug.cgi?id=1066780) - RFE: Improve the project list page [proto]


  Commit: 75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
      https://github.com/zanata/zanata-server/commit/75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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


  Commit: a1a8a605c96c870550858063cecc3038ee43cd68
      https://github.com/zanata/zanata-server/commit/a1a8a605c96c870550858063cecc3038ee43cd68
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-test-war/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

The pom conflicts were just the release version conflicting with the
development version. Kept the development version (3.7.0-SNAPSHOT) in
all cases.

The conflict in db.changelog-3.7.xml was caused by the file being created
in both release and master branches. In the release branch it had a single
changeset that was already in the master branch, so the master copy was
kept in its entirety. There was an XML comment on the changeset in release,
this was kept and put above the identical changeset in master.


  Commit: 9f0f82d030497b1bdd133dcab653fa0ab55b9390
      https://github.com/zanata/zanata-server/commit/9f0f82d030497b1bdd133dcab653fa0ab55b9390
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add 3.6.1 section

Also move Bug 1194543 to 3.6.1


  Commit: 53cc989f30c3f01c3683c588aa51f0de1ffa9b80
      https://github.com/zanata/zanata-server/commit/53cc989f30c3f01c3683c588aa51f0de1ffa9b80
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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


  Commit: 03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
      https://github.com/zanata/zanata-server/commit/03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release-notes.md


  Commit: 86afd037a5bf382267f23b44b68e274e699ed995
      https://github.com/zanata/zanata-server/commit/86afd037a5bf382267f23b44b68e274e699ed995
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1197902 - clear hibernate session after each translation batch save


  Commit: 0206a8b242d6bfc3a5f63ffae1530930804328c8
      https://github.com/zanata/zanata-server/commit/0206a8b242d6bfc3a5f63ffae1530930804328c8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge pull request #733 from zanata/rhbz1197902-push-slow

rhbz1197902 - clear hibernate session after each translation batch save


  Commit: 1e5a2f13cf189851edc0c383b125349c1c80d58e
      https://github.com/zanata/zanata-server/commit/1e5a2f13cf189851edc0c383b125349c1c80d58e
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/messages.properties
    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/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-group/settings-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/activity-entry.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
       A call to addAfterTestOperation() to delete all database entries had been removed in
      commit 0fa0a8ea34fe1a5c6463daa29f70f081748df0e4 but modified on release branch. Kept
      the integration/master version with the call absent.

	zanata-war/src/test/resources/arquillian/persistence.xml
       A property had been added in integration/master branch. Kept it.


  Commit: 3e944285f6b92a4729729bcd6fb8feda54f297bb
      https://github.com/zanata/zanata-server/commit/3e944285f6b92a4729729bcd6fb8feda54f297bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

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

Conflicts:
	docs/release-notes.md


  Commit: b03d30d86e36a16462c2bcf8820d431a8ab9fd94
      https://github.com/zanata/zanata-server/commit/b03d30d86e36a16462c2bcf8820d431a8ab9fd94
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

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

  Log Message:
  -----------
  Use version label template on version merge dialog.

This can be seen by navigating to:

 - version -> merge translations dialog


  Commit: 487cde4243a32df4553fca3b420ee04fd5939b02
      https://github.com/zanata/zanata-server/commit/487cde4243a32df4553fca3b420ee04fd5939b02
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add bugfix rhbz1202670 to release notes


  Commit: c002cb30f87db1b176809e3716ca3f6ce1714c28
      https://github.com/zanata/zanata-server/commit/c002cb30f87db1b176809e3716ca3f6ce1714c28
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/index.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    M mkdocs.yml

  Log Message:
  -----------
  Add command hook docs and update home page


  Commit: 333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
      https://github.com/zanata/zanata-server/commit/333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  Merge pull request #741 from zanata/display-version-state

Update version display for version merge, add release notes entry.


  Commit: a330cb1e6123c4a0346fcfb437b7cde2ded547cc
      https://github.com/zanata/zanata-server/commit/a330cb1e6123c4a0346fcfb437b7cde2ded547cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/index.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #744 from zanata/update-docs

Update docs


  Commit: 0ea0d3c3fb48eda646ce820575dfc6bf11254503
      https://github.com/zanata/zanata-server/commit/0ea0d3c3fb48eda646ce820575dfc6bf11254503
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

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

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

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


  Commit: 386919d8b5ca742faf9fc7aad7093c8f1e3bf002
      https://github.com/zanata/zanata-server/commit/386919d8b5ca742faf9fc7aad7093c8f1e3bf002
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Edit and delete tests for project language alias


  Commit: 735b6666641495262fc216e5541fdaf6219bd8e0
      https://github.com/zanata/zanata-server/commit/735b6666641495262fc216e5541fdaf6219bd8e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
	zanata-war/src/main/webapp/language/home.xhtml


  Commit: 0a4465ec09aebd0ea4d07540d90c87748a91f713
      https://github.com/zanata/zanata-server/commit/0a4465ec09aebd0ea4d07540d90c87748a91f713
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/user-guide/project-types.md

  Log Message:
  -----------
  Update docs for project type


  Commit: 76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
      https://github.com/zanata/zanata-server/commit/76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/user-guide/project-types.md

  Log Message:
  -----------
  Merge pull request #748 from zanata/project-type-docs

Update docs for project type


  Commit: 8b37b3a20b8c88cc8edbb17901d2bd9a3a830578
      https://github.com/zanata/zanata-server/commit/8b37b3a20b8c88cc8edbb17901d2bd9a3a830578
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml

  Log Message:
  -----------
  upgrade zanata-common to 3.6.0


  Commit: df6cae674be93b1d3be41283695028c431bc45c6
      https://github.com/zanata/zanata-server/commit/df6cae674be93b1d3be41283695028c431bc45c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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

Conflicts:
	docs/release-notes.md
	zanata-war/pom.xml


  Commit: 9fd2486b7932d983c0ce64617658816119a2c42e
      https://github.com/zanata/zanata-server/commit/9fd2486b7932d983c0ce64617658816119a2c42e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    R CHANGELOG.md
    M docs/configuration/installation.md
    M docs/release-notes.md

  Log Message:
  -----------
  Moved changelog.md to readthedocs section

Squashed commit of the following:

commit 426132892e13a79a9db90ed9fd548e4faf513756
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 08:41:10 2015 +1000

    Remove changeLog.md, all moved to readthedocs

commit 08aac89c4974270af093fd11ba51a5af858c2545
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 25 16:36:23 2015 +1000

    Update old release notes for readthedocs


  Commit: 70ff2ce5170dc5d6fb8f4a274d58712af6361732
      https://github.com/zanata/zanata-server/commit/70ff2ce5170dc5d6fb8f4a274d58712af6361732
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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


  Commit: d43744fe01f6d97c15727b33d9944068e04ca624
      https://github.com/zanata/zanata-server/commit/d43744fe01f6d97c15727b33d9944068e04ca624
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml

  Log Message:
  -----------
  Merge pull request #747 from zanata/rhbz1029734-po-header

upgrade zanata-common to 3.6.0


  Commit: 5c0fe34179f85b3817db92539672f6560428eadc
      https://github.com/zanata/zanata-server/commit/5c0fe34179f85b3817db92539672f6560428eadc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #716 from zanata/edit-and-delete-project-lang-alias

Edit and delete tests for project language alias


  Commit: 490b014d7f8b2022e062ffacde2c0e9dca61d7a1
      https://github.com/zanata/zanata-server/commit/490b014d7f8b2022e062ffacde2c0e9dca61d7a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

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

  Log Message:
  -----------
  Log as DEBUG when permission is denied (not WARN)


  Commit: e9d0b2c07259fe76e638f3f3b1e5c6e920d3f521
      https://github.com/zanata/zanata-server/commit/e9d0b2c07259fe76e638f3f3b1e5c6e920d3f521
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
    M 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/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java

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

Conflicts:
	docs/release-notes.md
	zanata-war/src/test/java/org/zanata/RestTest.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java


  Commit: af1ae14ae768cb1652513cbb2205f65f4a790742
      https://github.com/zanata/zanata-server/commit/af1ae14ae768cb1652513cbb2205f65f4a790742
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

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

  Log Message:
  -----------
  Restore constraints on glossary tables for H2


  Commit: 8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
      https://github.com/zanata/zanata-server/commit/8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    R CHANGELOG.md
    M docs/configuration/authentication.md
    M docs/configuration/infinispan.md
    A docs/configuration/installation.md
    A docs/images/project-view-versions.png
    A docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-dialog.png
    A docs/images/version-merge-trans-progress.png
    A docs/images/version-more-action-menu.png
    A docs/images/version-view-languages.png
    M docs/index.md
    M docs/release-notes.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    A docs/user-guide/merge-translations.md
    M docs/user-guide/project-types.md
    A docs/user-guide/projects/project-view.md
    A docs/user-guide/user-profile.md
    A docs/user-guide/versions/version-view.md
    M etc/scripts/cargowait.sh
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M mkdocs.yml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.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/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M 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/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/java/org/zanata/ui/ActivityEntry.java
    A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.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-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    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/language/members-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-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/notification/NotificationManager.java


  Commit: 6ad52dedd57c3a9259cec0ef2fe4b11a65407bbf
      https://github.com/zanata/zanata-server/commit/6ad52dedd57c3a9259cec0ef2fe4b11a65407bbf
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

  Log Message:
  -----------
  Remove log message that was unintentionally committed


  Commit: 70c2121bcfcc5d23ae1f124528ccc0cb13b82a4d
      https://github.com/zanata/zanata-server/commit/70c2121bcfcc5d23ae1f124528ccc0cb13b82a4d
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #757 from zanata/remove-excess-logging

Remove log message that was unintentionally committed


  Commit: 25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
      https://github.com/zanata/zanata-server/commit/25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

  Log Message:
  -----------
  Check errors when a test page is created/returned

We can assume, in cases other than testing the error page, that
the error page should not be seen when transitioning between
other pages.  Add a check in the constructor for all core pages
of Zanata.


  Commit: 846756e5dccd8530faaef9524baeaf049ebb48e3
      https://github.com/zanata/zanata-server/commit/846756e5dccd8530faaef9524baeaf049ebb48e3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Remove excess waits for test page


  Commit: 26bf0a4764d644ba7e6d1186297354ee1671c920
      https://github.com/zanata/zanata-server/commit/26bf0a4764d644ba7e6d1186297354ee1671c920
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5


  Commit: 3b41c40ce17eae3d8eab4ee52f30fd9038f4378d
      https://github.com/zanata/zanata-server/commit/3b41c40ce17eae3d8eab4ee52f30fd9038f4378d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #755 from zanata/restore-glossary-constraints

Restore constraints on glossary tables for H2


  Commit: 08e2ac3ce9bbbc44b5f67fd0181fa8b3dfafdc8e
      https://github.com/zanata/zanata-server/commit/08e2ac3ce9bbbc44b5f67fd0181fa8b3dfafdc8e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M docs/configuration/installation.md

  Log Message:
  -----------
  Mention MySQL 5.5 specifically


  Commit: e74f9e52e369fb6055e65e0bebd2508272898709
      https://github.com/zanata/zanata-server/commit/e74f9e52e369fb6055e65e0bebd2508272898709
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

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

  Log Message:
  -----------
  rhbz1165939 Do not display empty actions panel on groups page


  Commit: 1daed2500e28de531e83ffe12cbf5ae23cc18c93
      https://github.com/zanata/zanata-server/commit/1daed2500e28de531e83ffe12cbf5ae23cc18c93
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #760 from zanata/rhbz1165939

rhbz1165939 Do not display empty actions panel on groups page


  Commit: 4b1baa596433b6fa70361b3409645e24621a4a43
      https://github.com/zanata/zanata-server/commit/4b1baa596433b6fa70361b3409645e24621a4a43
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.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/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.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/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.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/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
    A zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/Event.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/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
    A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java

  Log Message:
  -----------
  Merge pull request #653 from zanata/cdi-prep

Prepare for CDI move

- Convert our Seam events to be closer to CDI events.
- Reimplement FacesMessages to be independent of Seam.


  Commit: 4fa9e013f9c8442233e5977852510898cae12d8e
      https://github.com/zanata/zanata-server/commit/4fa9e013f9c8442233e5977852510898cae12d8e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Rename Obsolete to Archived in UI and tests


  Commit: e03311131c4bff95df2462d4cc9c45d2d02a59de
      https://github.com/zanata/zanata-server/commit/e03311131c4bff95df2462d4cc9c45d2d02a59de
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #758 from zanata/fix-some-texts

Rename Obsolete to Archived in UI and tests


  Commit: 129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
      https://github.com/zanata/zanata-server/commit/129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Merge pull request #671 from zanata/remove-excess-wait

Remove excess waits for test page


  Commit: 88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
      https://github.com/zanata/zanata-server/commit/88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #641 from zanata/me-plural

add plural form for me-ME


  Commit: c709d394b183c1aff92511185eec3df412789e8c
      https://github.com/zanata/zanata-server/commit/c709d394b183c1aff92511185eec3df412789e8c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #676 from zanata/check-test-for-error-page

Check errors when a test page is created/returned


  Commit: 762490d783ee8ffa8599abf03b39f44a36f93a3a
      https://github.com/zanata/zanata-server/commit/762490d783ee8ffa8599abf03b39f44a36f93a3a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

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

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


  Commit: 8ef4f08abe8d036c142ef1410f39286262efbdf0
      https://github.com/zanata/zanata-server/commit/8ef4f08abe8d036c142ef1410f39286262efbdf0
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add release note for rhbz1165939


  Commit: 307b8908e53676bb5b164bd8c1d88f0acc56a631
      https://github.com/zanata/zanata-server/commit/307b8908e53676bb5b164bd8c1d88f0acc56a631
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

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

Conflicts:
	pom.xml


  Commit: f857aaadaca09efd379ff741d23277cd584236d3
      https://github.com/zanata/zanata-server/commit/f857aaadaca09efd379ff741d23277cd584236d3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

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


  Commit: 80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
      https://github.com/zanata/zanata-server/commit/80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

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


  Commit: d96793c2bad174bf6812ca4777c107bec138964b
      https://github.com/zanata/zanata-server/commit/d96793c2bad174bf6812ca4777c107bec138964b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

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

  Log Message:
  -----------
  Replace single quotes (swallowed by MessageFormat) with double quotes


  Commit: 59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
      https://github.com/zanata/zanata-server/commit/59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

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

  Log Message:
  -----------
  Remove .url. keys to avoid confusing l10n-maven-plugin:validate


  Commit: 419b6ee142fb7cd0ec77fc3f4b63a093a83da0f8
      https://github.com/zanata/zanata-server/commit/419b6ee142fb7cd0ec77fc3f4b63a093a83da0f8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Rerun failing integration tests up to three times


  Commit: 889ebe7bc256db3e57069cd2a38bee8ac57ff9fd
      https://github.com/zanata/zanata-server/commit/889ebe7bc256db3e57069cd2a38bee8ac57ff9fd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Add deliberately flaky test


  Commit: 82d7892cff874b54cb0fc2365bbdca76921bd4ff
      https://github.com/zanata/zanata-server/commit/82d7892cff874b54cb0fc2365bbdca76921bd4ff
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Add person search tests


  Commit: 4e098e3236de8c691bb4ace2eade7094c5c84a46
      https://github.com/zanata/zanata-server/commit/4e098e3236de8c691bb4ace2eade7094c5c84a46
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Merge pull request #756 from zanata/mariadb-fix

rhbz1048293 Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5


  Commit: 5e9decdc0f7ec424618175060203f24f19acdf95
      https://github.com/zanata/zanata-server/commit/5e9decdc0f7ec424618175060203f24f19acdf95
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

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

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


  Commit: c63409a760de7f59cd1e7489f4067357bab09fad
      https://github.com/zanata/zanata-server/commit/c63409a760de7f59cd1e7489f4067357bab09fad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

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


  Commit: 06db1090b75be199498b29a6eea075851d4d9c73
      https://github.com/zanata/zanata-server/commit/06db1090b75be199498b29a6eea075851d4d9c73
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

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


  Commit: d102ee2e4250400ad30412b4ec19e44593283b77
      https://github.com/zanata/zanata-server/commit/d102ee2e4250400ad30412b4ec19e44593283b77
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

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


  Commit: 0c3dad8bb3d9b44d86eaa928c6bb111b70692839
      https://github.com/zanata/zanata-server/commit/0c3dad8bb3d9b44d86eaa928c6bb111b70692839
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

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

  Log Message:
  -----------
  Skip checking of critical errors (too slow due to implicit wait)


  Commit: 9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
      https://github.com/zanata/zanata-server/commit/9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #777 from zanata/skip-check-crit

Skip checking of critical errors (too slow due to implicit wait)


  Commit: 7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
      https://github.com/zanata/zanata-server/commit/7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #767 from zanata/clean-for-l10n-validate

Clean for l10n validate


  Commit: bae3c77b6fa4f12e5233ff3190e76a2865c5be36
      https://github.com/zanata/zanata-server/commit/bae3c77b6fa4f12e5233ff3190e76a2865c5be36
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    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/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/WEB-INF/urlrewrite.xml
    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/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Move zanata-assets as JAR and as dependency from zanata-server
https://bugzilla.redhat.com/show_bug.cgi?id=1207423

Squashed commit of the following:

commit 400b523966d085c6f346e95e56144225e6b37e8f
Merge: 6a59b8a 9c3d0e6
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 20 10:18:40 2015 +1000

    Merge branch 'integration/master' into zanata-assets-jar

commit 6a59b8a892d82d287a3b81a733f279f212252eb2
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Apr 17 07:08:34 2015 +1000

    Change overriding of  to system properties

commit 9e90103ad33c4e09d6c3f015ec76885429f430c2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 16 16:52:15 2015 +1000

    Update release notes, add bean for assets['resource']

commit 253579d009fbf37a340cb72bf74a2aef68278d51
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 14 13:05:10 2015 +1000

    Add jars/assets as prefix for zanata-assets resource

commit 5070aa69dc2cd99121f11a673a25eb33027e68fb
Merge: f28152e 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 12:39:50 2015 +1000

    Merge branch 'integration/master' into zanata-assets-jar

    Conflicts:
    	zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

commit f28152e856930f7dd69eb1ee76a62e4042c017a4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 08:45:05 2015 +1000

    Refactor assets url to be configurable in standalone.xml

commit 9194662feb68e33626b0ed4d65a542b81faedfbe
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 30 15:00:59 2015 +1000

    Add release notes and comments for zanata-assets-jar changes

commit 5a3f613ef1ad3250f2525dfe6279e5c957d83173
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 30 13:23:31 2015 +1000

    Remove webAssets config, add urlrewrite for .seam extension of resource file

commit f1e12dd8f35f246a7c1bc9f65ec7f4391bb1662d
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 27 15:51:39 2015 +1000

    Migrate to zanata-assets.jar reference


  Commit: 63708bdf5095584ea4add217386013fcfb5b4a4a
      https://github.com/zanata/zanata-server/commit/63708bdf5095584ea4add217386013fcfb5b4a4a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Wait for page loaders to be finished before proceeding

Requires the class 'is-active' to be present in the web element,
as the loader is always present and visible.


  Commit: a50f201e005f0f87592619f10ce24a22fffaa0f4
      https://github.com/zanata/zanata-server/commit/a50f201e005f0f87592619f10ce24a22fffaa0f4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Merge pull request #779 from zanata/wait-for-loaders

Wait for page loaders to be finished before proceeding


  Commit: 0158851c7cada52fbad2bdcc15ff49d230c14387
      https://github.com/zanata/zanata-server/commit/0158851c7cada52fbad2bdcc15ff49d230c14387
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Merge pull request #766 from zanata/person-search-test

Add person search tests


  Commit: 2be83b0dbf47af1a5673e8f6c37236412c12412c
      https://github.com/zanata/zanata-server/commit/2be83b0dbf47af1a5673e8f6c37236412c12412c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

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

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


  Commit: 3448525629c793028c96e9f1243f477b8be04f1f
      https://github.com/zanata/zanata-server/commit/3448525629c793028c96e9f1243f477b8be04f1f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #762 from zanata/add-release-note-rhbz1165939

Add release note for rhbz1165939


  Commit: a0152f0726f0fca4d41482f30db67339a36c9564
      https://github.com/zanata/zanata-server/commit/a0152f0726f0fca4d41482f30db67339a36c9564
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.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/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java

  Log Message:
  -----------
  Fix 'restore default' for editor

https://bugzilla.redhat.com/show_bug.cgi?id=895881

Squashed commit of the following:

commit 7d1f1669cda9248612cf26b3de67cccf0656f2fd
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:04:17 2015 +1000

    Restore default for reference locale

commit 826a53eb60af5825ffe147c97b68111f1068c120
Merge: 2e32f1e 3448525
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 19:37:16 2015 +1000

    Merge branch 'integration/master' into rhbz895881

commit 2e32f1e687c08116f783e33c4149d428d6b6da72
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 14 16:18:27 2015 +1000

    Fix 'restore default' for editor
    https://bugzilla.redhat.com/show_bug.cgi?id=895881


  Commit: 70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
      https://github.com/zanata/zanata-server/commit/70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

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

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

Conflicts:
	functional-test/pom.xml


  Commit: f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
      https://github.com/zanata/zanata-server/commit/f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.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 zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    R zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    A zanata-war/src/main/java/org/zanata/adapter/PropertiesAdapter.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    R zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.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/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    R 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/email/EmailStrategyTest.java

  Log Message:
  -----------
  Update request to join group/language page

https://bugzilla.redhat.com/show_bug.cgi?id=1207426

Squashed commit of the following:

commit 79184b7cbf4189a8cae9311c7bbbc15ef5178eab
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 22 09:37:22 2015 +1000

    Disable contact coordinator button is empty message

commit 276e1ba5a250ef13bb9b4930e12ef3c93d9039ab
Merge: d177563 3448525
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:43:39 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit d177563e8718b17cd672c522264eede92b14c8d0
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:43:18 2015 +1000

    Add 'No versions' indicator for request join group, fix checkbox for request join language, fix contact coordinator 'Send' button

commit 76951a6934fa4535be4872a1780d504317f337aa
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 15:35:41 2015 +1000

    Add release notes

commit c28e17f602eb1b30cbf3cbbd622cf3f91dae1581
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 13 16:23:35 2015 +1000

    Refactor sendEmailAction

commit 6beb3d8fde8206cdda9481fd8d6bca93ea2595fe
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 16:45:38 2015 +1000

    Fix button disabled when non-selected in version group request

commit 512768810e6c42aea2f396ec8416434b867f6151
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 10:12:56 2015 +1000

    Use absolute path reference in JSF

commit 2a82c12fd7e58673b3c0c4c83dba9c33cd841020
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 10:09:12 2015 +1000

    Revert messages properties

commit 2d600e01471f767556263323f648389b70ffb118
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 09:29:07 2015 +1000

    Remove unused method

commit 84d86fa4face258c64ef11f0de8779bd625dd13f
Merge: 7395b78 307b890
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 08:46:54 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit 7395b78fa11358bfa30aebdf108a05cb5ff99195
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 15:26:16 2015 +1000

    Fix functional test

commit be9c2247076094ad9e8e708943d7221dbc7f3bbb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 08:57:35 2015 +1000

    Refactor, add comments in version-group join method

commit 5b3f90934591ddc56cf711c1b130aad370ece743
Merge: bbe42df e033111
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 08:08:00 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit bbe42dfc7c144605d95bfa18d320f75457678d0e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 15:07:43 2015 +1000

    fix checkstyle

commit 65eeb018051446ebfd2654b971719f3452042a50
Merge: f76ad23 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 12:48:51 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

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

commit f76ad237e491af0b3a5906ea1bbf10bdd1fada17
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 14:47:30 2015 +1000

    remove old request_join for version group

commit 3b47b6f9d307d7d5598f5876a216e23e9823f74e
Merge: 447ec2b e9d0b2c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 10:44:58 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit 447ec2b6cb3235ba18e6be23e8385e44aacf2cd9
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 13:43:34 2015 +1000

    WIP: Get checkbox rerender send buttons

commit 24cd0af46d1cfafae92a4de2b4e38c8a98e5b6c1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 13:01:57 2015 +1000

    Rename selectableProject to selectableVersion

commit ccee996ab97c09b497c5c52fe3c1b2f17010b28b
Merge: b155f2e 9fd2486
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 10:17:47 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit b155f2e22d8a8afc1da4442ff5fb126799588ae6
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 16:07:31 2015 +1000

    Initial build for version group request

commit a99814cf806cd6682635a267b8a5f5dc18cf4b85
Merge: dad7852 bacdfcd
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 13:39:53 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit dad7852e37e4664353e867760b1f12c454595ea1
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 13:27:53 2015 +1000

    WIP: converting join group to model

commit c489b57919e9c5c95d08d7a3dd7baca07685f4de
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 09:59:43 2015 +1000

    Implement modal dialog for request to join language page

commit 9b7048807e21641e9921109393a42b53eaa7b371
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 15:44:31 2015 +1000

    Clear selected roles when cancel

commit a9d3eac95abcf2b37e55ee0350f5a5475ad1bb6f
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 13:14:23 2015 +1000

    Create request join and update role dialog

commit 1719dfbf5f8c1485822eeb59174d9d8596e43f3e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 09:00:33 2015 +1000

    Refactor contact admin and coordinator dialog

commit 139982095d4f1aa12ed1913debd2fc0f2e894645
Merge: 32679e4 649a824
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 06:52:41 2015 +1000

    Merge remote-tracking branch 'origin' into update-join-language-page

commit 32679e45ff296d3f0a75e84512c75751e7368fd4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 3 15:35:28 2015 +1000

    Update join language page


  Commit: c5130c055d950c5d70755a9438951e20139a2d5e
      https://github.com/zanata/zanata-server/commit/c5130c055d950c5d70755a9438951e20139a2d5e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

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

  Log Message:
  -----------
  Fix checkstyle failure


  Commit: 7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
      https://github.com/zanata/zanata-server/commit/7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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

Conflicts:
	functional-test/pom.xml


  Commit: 300a693efa9727b7ac95eb2a27f834425db76698
      https://github.com/zanata/zanata-server/commit/300a693efa9727b7ac95eb2a27f834425db76698
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-24 (Fri, 24 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  Update the copyright year displayed to 2008-$currentYear


  Commit: 10c2989766526348d8e9103ba35bf0782af0f62e
      https://github.com/zanata/zanata-server/commit/10c2989766526348d8e9103ba35bf0782af0f62e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java

  Log Message:
  -----------
  rhbz1205512 - run validation button on document list page will be
disabled if no validation to run


  Commit: 23e51d6809ecf66fdd1161952c6e8fdb8adcefed
      https://github.com/zanata/zanata-server/commit/23e51d6809ecf66fdd1161952c6e8fdb8adcefed
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  Merge pull request #765 from zanata/update-copyright-2015

Update the copyright year to current year


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/log4j.xml
    M pom.xml
    M zanata-model/pom.xml
    A zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    A zanata-model/src/test/java/org/zanata/model/validator/UrlValidatorTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
    M zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    R zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
    R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
    R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    A zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
    M zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
    A zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
    A zanata-war/src/test/java/org/zanata/notification/ExpiryLetterQueueReceiverTest.java
    A zanata-war/src/test/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandlerTest.java
    A zanata-war/src/test/java/org/zanata/notification/MessageUnwrapperTest.java
    A zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequest.java
    R zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
    R zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/VersionRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/CopyTransRestITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    A zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java
    R zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Squashed commit of the following (PR642):

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

commit f2c2b7b66ddad082eb27535c1d108d0a52fe94b8
Merge: dfae212 7a5769a
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Apr 28 11:02:02 2015 +1000

    Merge branch 'master' into jersey-boys

commit dfae212b45954d0e4f344f11f44af14a68d601f4
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Apr 23 15:25:23 2015 +1000

    accept json in server configuration REST service and fix tests

commit 973a93a447e080e3af93ff731d60775c4580f31d
Merge: 5c0d9d7 a0152f0
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Apr 22 14:36:47 2015 +1000

    Merge branch 'master' into jersey-boys

    Conflicts:
    	zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    	zanata-war/src/test/java/org/zanata/RestTest.java

commit 5c0d9d7b65bdc54668a8bccca180467634cc26bb
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Mar 26 20:49:07 2015 +1000

    fix functional test

commit 2e9fdccda67cb3f0b1e2c8f8d5794c3aac85a86d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Mar 26 17:16:20 2015 +1000

    fix functional test

commit 10e3748640bdce7c8e1aee08136befcbd42bfae7
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Mar 26 14:12:50 2015 +1000

    add json tests

commit 6131e6b2adb6eb44ee819667bac361787556b3a2
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Mar 26 13:04:48 2015 +1000

    include exception in log

commit 27991b2c379215269a47a4f7296648625d882731
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Mar 20 14:13:27 2015 +1000

    remove dependency of zanata client and tighten dup finder config

commit 3296a08687318c7cab3e22548cd2441129f80789
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jan 23 14:45:35 2015 +1000

    increase test coverage

commit 00da2a6f4d1d7615bbb4d3ce95187e688f153de1
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jan 16 08:47:50 2015 +1000

    rhbz1124630 - convert proxy based REST tests to raw REST tests

commit d1cdaca6396cac8344108c69f22099337cad1ec1
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Dec 1 14:21:22 2014 +1000

    rhbz1124630 - move client interface to server to avoid massive change in testing


  Commit: 774be1165637f0aa506167f575ead8d6c4786f3c
      https://github.com/zanata/zanata-server/commit/774be1165637f0aa506167f575ead8d6c4786f3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java

  Log Message:
  -----------
  Merge pull request #783 from zanata/rhbz1205512

rhbz1205512 - run validation button on document list page wont be disabled


  Commit: 78a8240949cd7ae44dcd641e2f2214ac828774aa
      https://github.com/zanata/zanata-server/commit/78a8240949cd7ae44dcd641e2f2214ac828774aa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/HasUserFriendlyToString.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  rhbz903964 - produce better error message when permission check failed


  Commit: 9caaf667632c3cf6bc94680e8b8a8c466721b96d
      https://github.com/zanata/zanata-server/commit/9caaf667632c3cf6bc94680e8b8a8c466721b96d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java

  Log Message:
  -----------
  fix tests after changing 401 to 403


  Commit: 72738ba50e7e6a5e24be753d40d418e3a0183b08
      https://github.com/zanata/zanata-server/commit/72738ba50e7e6a5e24be753d40d418e3a0183b08
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

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

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


  Commit: 479dc2dc3dc1ee543c816c7c182bb46ab06b1661
      https://github.com/zanata/zanata-server/commit/479dc2dc3dc1ee543c816c7c182bb46ab06b1661
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/HasUserFriendlyToString.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java

  Log Message:
  -----------
  Merge pull request #787 from zanata/rhbz903964-better-error-msg

rhbz903964 - produce better error message when permission check failed


  Commit: a8ff08485d86a7c23989d1ea1f083a62a5f643c6
      https://github.com/zanata/zanata-server/commit/a8ff08485d86a7c23989d1ea1f083a62a5f643c6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  Fix REST permission test after response changes


  Commit: 83bed11e1d4fbbe0f8165805799a4da4a8b6041c
      https://github.com/zanata/zanata-server/commit/83bed11e1d4fbbe0f8165805799a4da4a8b6041c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #788 from zanata/fix-rest-permission-test

Fix REST permission test after response changes


  Commit: be9e73bb227d4b2b8e88ce4a7ea0b480b78c1116
      https://github.com/zanata/zanata-server/commit/be9e73bb227d4b2b8e88ce4a7ea0b480b78c1116
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  Add server logging for failure responses


  Commit: 3f5db95a5eb8eb84371f9d852a8ce3a4d2a0f961
      https://github.com/zanata/zanata-server/commit/3f5db95a5eb8eb84371f9d852a8ce3a4d2a0f961
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

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

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


  Commit: bb1bb593b5116ce8fd6dc7d18863d066c9488556
      https://github.com/zanata/zanata-server/commit/bb1bb593b5116ce8fd6dc7d18863d066c9488556
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  Merge pull request #789 from zanata/logging-for-failures

Add server logging for failure responses


  Commit: b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
      https://github.com/zanata/zanata-server/commit/b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    A zanata-liquibase/pom.xml
    A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
    A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Merge branch 'ensure-innodb' into ensure-innodb-on-37

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml


  Commit: 0f062494c39e4b809f42584c9220dd650f328088
      https://github.com/zanata/zanata-server/commit/0f062494c39e4b809f42584c9220dd650f328088
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-05 (Tue, 05 May 2015)

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

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

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


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade failsafe to SNAPSHOT which fixes SUREFIRE-1152


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

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    A zanata-liquibase/pom.xml
    A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
    A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Merge pull request #791 from zanata/ensure-innodb-on-37

Ensure innodb on 3.7


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

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

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

Conflicts:
	functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java


  Commit: 9201cfbb64b32692c801cb9dfedca6a6db20b19f
      https://github.com/zanata/zanata-server/commit/9201cfbb64b32692c801cb9dfedca6a6db20b19f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    A docs/images/account-activated.png
    A docs/images/account-resend-activation.png
    A docs/images/account-settings-email.png
    A docs/images/account-settings-languages.png
    A docs/images/account-settings-password.png
    A docs/images/account-signup-openid-details.png
    A docs/images/admin-contact-link.png
    A docs/images/admin-contact.png
    A docs/images/admin-menu-access.png
    A docs/images/admin-sections.png
    A docs/images/copy-trans-access.png
    A docs/images/copy-trans-dialog.png
    A docs/images/copy-trans-newversion.png
    A docs/images/copy-trans-permissive.png
    A docs/images/copy-trans-strict.png
    A docs/images/copy-version-access.png
    A docs/images/copy-version-access2.png
    A docs/images/copy-version.png
    A docs/images/create-group-completed.png
    A docs/images/create-group.png
    M docs/images/create-project-completed.png
    M docs/images/create-project.png
    R docs/images/create-version-master.png
    R docs/images/create-version.png
    A docs/images/editor-approve-button.png
    A docs/images/editor-approved.png
    A docs/images/editor-doc-list-settings.png
    A docs/images/editor-doc-list-validations.png
    A docs/images/editor-doc-list.png
    A docs/images/editor-filter-translated.png
    A docs/images/editor-history-button.png
    A docs/images/editor-open-menu.png
    A docs/images/editor-overview.png
    A docs/images/editor-readonly-indicator.png
    A docs/images/editor-reject-dialog.png
    A docs/images/editor-rejected-history.png
    A docs/images/editor-rejected-with-comment.png
    A docs/images/editor-settings.png
    A docs/images/editor-translated-strings.png
    A docs/images/editor-validations.png
    A docs/images/editor-views-icon.png
    A docs/images/glossary-csv.png
    A docs/images/glossary-upload-windows-po.png
    A docs/images/glossary-upload-windows.png
    A docs/images/glossary-upload.png
    A docs/images/group-general-settings.png
    A docs/images/group-languages-settings.png
    A docs/images/group-maintainer-settings.png
    A docs/images/group-projects-remove.png
    A docs/images/group-projects-settings.png
    A docs/images/group-request-join-dialog.png
    A docs/images/group-request-join.png
    A docs/images/group-settings-button.png
    A docs/images/group-view-languages.png
    A docs/images/language-add-member.png
    A docs/images/language-contact-coordinator.png
    A docs/images/language-contact-menu.png
    A docs/images/language-leave-team.png
    A docs/images/language-members-tab.png
    A docs/images/language-request-join-menu.png
    A docs/images/language-request-join.png
    A docs/images/merge-trans-access.png
    A docs/images/merge-trans-dialog.png
    M docs/images/project-about-settings.png
    M docs/images/project-general-settings.png
    M docs/images/project-languages-add.png
    M docs/images/project-languages-remove.png
    M docs/images/project-languages-settings.png
    M docs/images/project-permissions-settings.png
    M docs/images/project-settings-button.png
    M docs/images/project-translation-settings.png
    A docs/images/project-user-search.png
    M docs/images/project-view-versions.png
    A docs/images/project-webhooks-settings-2.png
    A docs/images/project-webhooks-settings.png
    A docs/images/upload-new-source-doc.png
    A docs/images/upload-source-doc-dialog.png
    A docs/images/upload-source-doc-from-settings.png
    A docs/images/upload-source-doc.png
    A docs/images/upload-translation-doc-dialog.png
    A docs/images/upload-translation-doc.png
    M docs/images/user-dashboard-create-version.png
    A docs/images/user-dashboard-versions.png
    A docs/images/user-dashboard-view.png
    A docs/images/user-dashboard.png
    A docs/images/user-profile.png
    A docs/images/version-create-new.png
    A docs/images/version-create.png
    A docs/images/version-documents-settings.png
    A docs/images/version-download-translations-all-dialog.png
    A docs/images/version-download-translations-all.png
    A docs/images/version-download-translations.png
    A docs/images/version-general-settings.png
    A docs/images/version-languages-settings.png
    M docs/images/version-merge-trans-cancel.png
    M docs/images/version-merge-trans-dialog.png
    M docs/images/version-merge-trans-progress.png
    M docs/images/version-more-action-menu.png
    A docs/images/version-settings-button.png
    A docs/images/version-translation-settings.png
    M docs/images/version-view-languages.png
    A docs/images/webtrans-access.png
    M docs/index.md
    R docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/account/account-activate.md
    A docs/user-guide/account/account-resend-activation.md
    A docs/user-guide/account/account-settings.md
    A docs/user-guide/account/account-sign-up.md
    A docs/user-guide/account/user-dashboard.md
    A docs/user-guide/account/user-profile.md
    A docs/user-guide/admin/admin-overview.md
    A docs/user-guide/admin/contact-admin.md
    A docs/user-guide/api/api.md
    R docs/user-guide/client-command-hook.md
    R docs/user-guide/client-configuration.md
    A docs/user-guide/client/client.md
    R docs/user-guide/contributing-translations.md
    A docs/user-guide/drupal/drupal.md
    A docs/user-guide/editor/documents-view.md
    A docs/user-guide/editor/editor-view.md
    A docs/user-guide/editor/keyboard-shortcuts.md
    A docs/user-guide/editor/overview.md
    A docs/user-guide/editor/translation-history.md
    A docs/user-guide/glossary/delete-glossaries.md
    A docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/glossary-roles-permissions.md
    A docs/user-guide/glossary/upload-glossaries.md
    A docs/user-guide/groups/create-group.md
    A docs/user-guide/groups/group-settings.md
    A docs/user-guide/groups/group-view.md
    R docs/user-guide/joining-a-language-team.md
    R docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/languages/add-team-member.md
    A docs/user-guide/languages/language-team.md
    A docs/user-guide/languages/modify-role.md
    R docs/user-guide/merge-translations.md
    A docs/user-guide/project-maintainer-guide.md
    R docs/user-guide/project-types.md
    M docs/user-guide/projects/create-project.md
    R docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/gettext-example.md
    A docs/user-guide/projects/import-projects.md
    A docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/project-types.md
    M docs/user-guide/projects/project-view.md
    R docs/user-guide/projects/upload-strings.md
    A docs/user-guide/projects/validations.md
    A docs/user-guide/review/add-reviewer.md
    A docs/user-guide/review/overview.md
    A docs/user-guide/review/review-enable.md
    A docs/user-guide/review/translation-review.md
    A docs/user-guide/translation-reuse/copy-trans.md
    A docs/user-guide/translation-reuse/copy-version.md
    A docs/user-guide/translation-reuse/merge-trans.md
    A docs/user-guide/translator-guide.md
    R docs/user-guide/translators-new-account.md
    R docs/user-guide/user-profile.md
    A docs/user-guide/versions/create-version.md
    A docs/user-guide/versions/download-translations.md
    A docs/user-guide/versions/merge-translations.md
    A docs/user-guide/versions/request-to-join-group.md
    A docs/user-guide/versions/upload-strings.md
    A docs/user-guide/versions/version-settings.md
    M mkdocs.yml

  Log Message:
  -----------
  Move documentation to readthedocs

https://bugzilla.redhat.com/show_bug.cgi?id=1204982

Squashed commit of the following:

commit 97d705bc5afabfe5265923caeb05cadf01973959
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 14:08:47 2015 +1000

    run png crush on png images

commit 1da5a0a94ce6b67b1b8295350dd537cf155f26d9
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 13:44:54 2015 +1000

    Add Editor view details

commit aab34744e0d5832651c2c475fe0b98900abf2668
Merge: e6f7391 ab66f42
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 13:13:10 2015 +1000

    Merge branch 'integration/master' into rhbz1204982

commit e6f7391d50640e411b7e65a7c7bfd5f25d875d48
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 11:09:59 2015 +1000

    Convert .png to .gif

commit 184ba1f741c90225a12e64af2813ab4839311975
Author: Damian Jansen <djansen at redhat.com>
Date:   Tue May 5 09:41:49 2015 +1000

    Spellcheck docs

commit c8e1969aabdc75631d2e5a8322727aab49e9643f
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 07:21:44 2015 +1000

    Add user guide

commit 5cc09f300a61f01ca298c6b7f0872dc0bd544627
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 30 15:51:23 2015 +1000

    Migrade docs and manual from zanata.org/help

commit ed33d9b2e2b47702f67c7f49549e1d5c0085cbd9
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 28 16:06:35 2015 +1000

    Add contact us in index page

commit 5a2aac30a1211f0a8b6fe2370cc9a0f0c59d8436
Merge: aeb9476 80260ce
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 28 15:12:03 2015 +1000

    Merge branch 'rhbz1204982' of github.com:zanata/zanata-server into rhbz1204982

commit aeb947683698dfa76345bfa781e723999588c14d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 28 15:11:49 2015 +1000

    Add download translations section

commit 80260ce93f013332bf2c150926fe0bf649a8b5be
Author: Damian Jansen <djansen at redhat.com>
Date:   Tue Apr 28 14:47:38 2015 +1000

    Review and update some of the new documentation entries

commit 926a53167b60afbd2941cc194347837a55aedd99
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 28 14:07:43 2015 +1000

    Restructure doc layout, add languages and groups section

commit e9ba9cc8adf393b988f71239c5ba6c7a0754b7fb
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 28 09:15:02 2015 +1000

    Add documentation for account, projects and versions

commit 1318a54c102bc3676f56f4c12ef02744e7f75e3e
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 27 15:27:14 2015 +1000

    Add Account section


  Commit: 85e6ed66d757f0f9c30147a47f2f9357185f7923
      https://github.com/zanata/zanata-server/commit/85e6ed66d757f0f9c30147a47f2f9357185f7923
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    A docs/images/role-assignment-access.png
    A docs/images/role-assignment-delete.png
    A docs/images/role-assignment-new-access.png
    A docs/images/role-assignment-new-form.png
    A docs/images/role-assignment-project.png
    A docs/images/role-assignment-view.png
    M docs/user-guide/admin/admin-overview.md
    A docs/user-guide/admin/role-assignment-rules.md
    M mkdocs.yml

  Log Message:
  -----------
  Add admin role assignment feature documentation

Squashed commit of the following:

commit cfe609645f559ebf6cf575a481b75cca4cbb77ff
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 16:15:30 2015 +1000

    Add admin role assignment doc


  Commit: 7b514b8f7887cfa3671dc9053ed02a5e9cf8d2be
      https://github.com/zanata/zanata-server/commit/7b514b8f7887cfa3671dc9053ed02a5e9cf8d2be
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/retry-flaky-tests' into integration/master

Conflicts:
	pom.xml


  Commit: 7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
      https://github.com/zanata/zanata-server/commit/7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

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

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

Conflicts:
	zanata-war/pom.xml


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

  Changed paths:
    M docs/index.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-types.md
    M mkdocs.yml

  Log Message:
  -----------
  Update index page of idoc, update missing podir example page


  Commit: 600c225efd3f07589c75562babcc2a4840abdeb5
      https://github.com/zanata/zanata-server/commit/600c225efd3f07589c75562babcc2a4840abdeb5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    R docs/configuration/authentication.md
    R docs/configuration/document-storage-directory.md
    R docs/configuration/email.md
    R docs/configuration/infinispan.md
    R docs/configuration/installation.md
    R docs/configuration/jms-messaging.md
    M docs/index.md
    A docs/user-guide/system-admin/configuration/authentication.md
    A docs/user-guide/system-admin/configuration/document-storage-directory.md
    A docs/user-guide/system-admin/configuration/email.md
    A docs/user-guide/system-admin/configuration/infinispan.md
    A docs/user-guide/system-admin/configuration/installation.md
    A docs/user-guide/system-admin/configuration/jms-messaging.md
    M mkdocs.yml

  Log Message:
  -----------
  Move 'configuration' to 'system-admin' section


  Commit: 49662a318693cd9c0d7eaeef1c7a121419738caa
      https://github.com/zanata/zanata-server/commit/49662a318693cd9c0d7eaeef1c7a121419738caa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Enable apache snapshots for surefire/failsafe


  Commit: a66bd763ec867e2cb1c38d844e05b19ded32fb3e
      https://github.com/zanata/zanata-server/commit/a66bd763ec867e2cb1c38d844e05b19ded32fb3e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M docs/user-guide/client/client.md

  Log Message:
  -----------
  Update link to Zanata client documentation


  Commit: cf51cac707e8868994f31f3e62d94a5f14407076
      https://github.com/zanata/zanata-server/commit/cf51cac707e8868994f31f3e62d94a5f14407076
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #798 from zanata/enable-apache-snapshots

Enable apache snapshots for surefire/failsafe


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

  Changed paths:
    R docs/configuration/authentication.md
    R docs/configuration/document-storage-directory.md
    R docs/configuration/email.md
    R docs/configuration/infinispan.md
    R docs/configuration/installation.md
    R docs/configuration/jms-messaging.md
    M docs/index.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-types.md
    A docs/user-guide/system-admin/configuration/authentication.md
    A docs/user-guide/system-admin/configuration/document-storage-directory.md
    A docs/user-guide/system-admin/configuration/email.md
    A docs/user-guide/system-admin/configuration/infinispan.md
    A docs/user-guide/system-admin/configuration/installation.md
    A docs/user-guide/system-admin/configuration/jms-messaging.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #797 from zanata/update-doc-index

Update index page of doc


  Commit: 638a7d2daa9040b93e53e5ebe830d02383f5f034
      https://github.com/zanata/zanata-server/commit/638a7d2daa9040b93e53e5ebe830d02383f5f034
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

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

  Log Message:
  -----------
  Declare required resources in jboss-web.xml


  Commit: 807ae4fd09d1d566824c3b7f4a488d5902b5a14c
      https://github.com/zanata/zanata-server/commit/807ae4fd09d1d566824c3b7f4a488d5902b5a14c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    A docs/user-guide/documents/custom-document-param.md
    A docs/user-guide/documents/download-translated-documents.md
    A docs/user-guide/documents/raw-documents.md
    A docs/user-guide/documents/upload-documents.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/gettext-example.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/system-admin/configuration/installation.md
    R docs/user-guide/versions/download-translations.md
    R docs/user-guide/versions/upload-strings.md
    M mkdocs.yml

  Log Message:
  -----------
  Add raw documents documentation


  Commit: 4ede4d36b03b2f12e0c8a08af69104d9ea2b43fc
      https://github.com/zanata/zanata-server/commit/4ede4d36b03b2f12e0c8a08af69104d9ea2b43fc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    A docs/user-guide/documents/custom-document-param.md
    A docs/user-guide/documents/download-translated-documents.md
    A docs/user-guide/documents/raw-documents.md
    A docs/user-guide/documents/upload-documents.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/gettext-example.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/system-admin/configuration/installation.md
    R docs/user-guide/versions/download-translations.md
    R docs/user-guide/versions/upload-strings.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #801 from zanata/raw-doc

Add raw documents documentation


  Commit: 62691a0a2d7b3c56c16bfd96eac321ceeca8cb51
      https://github.com/zanata/zanata-server/commit/62691a0a2d7b3c56c16bfd96eac321ceeca8cb51
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Remove google open id from signup page, redirect google login to password reset page, allow anonymous user to contact admin

https://bugzilla.redhat.com/show_bug.cgi?id=1218002


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Merge pull request #800 from zanata/rhbz1218002

Remove google open id from signup page


  Commit: 3360c69dc72a37c0137fc4d12cf55745d49f65d6
      https://github.com/zanata/zanata-server/commit/3360c69dc72a37c0137fc4d12cf55745d49f65d6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add release notes for https://bugzilla.redhat.com/show_bug.cgi?id=1218002


  Commit: 17ca61ed10480299667720b2e583f28c9d734641
      https://github.com/zanata/zanata-server/commit/17ca61ed10480299667720b2e583f28c9d734641
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #802 from zanata/update-release-notes

Add release notes for https://github.com/zanata/zanata-server/pull/800


  Commit: 2a0d805b25ad89de1aa77fd346276919e6d49694
      https://github.com/zanata/zanata-server/commit/2a0d805b25ad89de1aa77fd346276919e6d49694
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

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


  Commit: 8538e9803d0ad2768f17c106ea0f1c18b0df045a
      https://github.com/zanata/zanata-server/commit/8538e9803d0ad2768f17c106ea0f1c18b0df045a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  Merge pull request #803 from zanata/fix-functionalTest

Fix functional test


  Commit: 4a049705724406423e065c0d2ffc40f70069bd7d
      https://github.com/zanata/zanata-server/commit/4a049705724406423e065c0d2ffc40f70069bd7d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    A CONTRIBUTING.md

  Log Message:
  -----------
  Add CONTRIBUTING.md

See https://github.com/blog/1184-contributing-guidelines for
background.


  Commit: 847501d1e1b78a70187362f6e4dd285638b392d5
      https://github.com/zanata/zanata-server/commit/847501d1e1b78a70187362f6e4dd285638b392d5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    M zanata-war/pom.xml
    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/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/GettextAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/PropertiesLatinOneAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/PropertiesUTF8Adapter.java
    A zanata-war/src/main/java/org/zanata/adapter/XliffAdapter.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.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/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    R zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/util/FileUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.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/documents-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/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/util/FileUtilTest.java

  Log Message:
  -----------
  Server-side file conversion and REST service

https://bugzilla.redhat.com/show_bug.cgi?id=1186972

Squashed commit of the following:

commit 328c9cdd9a71c10cbaece336640cb203194f260c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 12 11:17:23 2015 +1000

    Fix unit test

commit 01099103a667dfabae7206674a15d43c310fdbeb
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 12 10:45:14 2015 +1000

    Remove banned dependency

commit 033f30fd13b075026a4baded94759e6c92efac2c
Merge: c4446f3 4a04970
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 12 10:41:24 2015 +1000

    Merge branch 'integration/master' into rhbz1186972

commit c4446f3f2a456562d265988146706631b59afb5f
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 11 08:18:09 2015 +1000

    Add check for invalid char in locale id for File-project type

commit b200c956a9e2963c095d706520ad415a288b873c
Merge: 069bfea a5b7b9e
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 7 15:56:27 2015 +1000

    Merge branch 'integration/master' into rhbz1186972

    Conflicts:
    	pom.xml
    	zanata-war/pom.xml
    	zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    	zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

commit 069bfeac868a9773f51f3cf68a25a3601a0f66f2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 7 11:23:18 2015 +1000

    Update release notes

commit 5ba88b11944f86c3a655cc4b3f39fdd761a81c8a
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 7 09:56:09 2015 +1000

    Format 'if(' with spacing

commit f7a5266d9fae8ae6ac3651d6a356fef23dd018be
Author: Alex Eng <aeng at redhat.com>
Date:   Wed May 6 15:55:56 2015 +1000

    Remove duplicate get file extension method, update styling for 'if'

commit d8286f6a27c39da03bc26a1efb12846fd6a01361
Author: Alex Eng <aeng at redhat.com>
Date:   Wed May 6 14:40:17 2015 +1000

    fix multi file upload accepted file descriptions

commit cc8dcbcd10ac770113d9c6fb8e81a0fd5f9dd1fb
Author: Alex Eng <aeng at redhat.com>
Date:   Wed May 6 13:50:16 2015 +1000

    Add @nonnull annotation for required param in FileFormatAdapter

commit a6499081bebc5dff378d123792ff5f4a550428e4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 5 10:14:28 2015 +1000

    Allow custom file extension to upload from client

commit 1fa6e2dccc86c2f0e793686497a607c85a875604
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 1 11:52:36 2015 +1000

    Refactor properties adapter file

commit 89fd494229298aad85446bc621c879aedf929e76
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 27 08:00:49 2015 +1000

    Fix download file option from UI

commit a4df408a858196a08cc729a7699c5b4b93e2b248
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Apr 24 14:03:26 2015 +1000

    Implement gettext adapter for file project type

commit 7fbbc0c1f9bf6232ac9d283d2c784d3d24ab5d8f
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 22 14:24:57 2015 +1000

    WIP: gettext adapter

commit a0028f7c3373965fa9ec1c28c6990dad9306c26d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 11:15:54 2015 +1000

    Add xliff type in server side conversion

commit e7bebe6dc7347542c3c556fd5c9632e8db1a8e9b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 20 13:12:34 2015 +1000

    Change default value of document type to null

commit 4c45fe617b3148916d8a62eadf6aa4f8598ac77c
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 13 10:24:01 2015 +1000

    Clear adapter selection when cancel upload trans-file

commit 27c6aa183186ef29375b5d7fdf2b6c11cec0f427
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Apr 12 19:24:03 2015 +1000

    Remove GWT upload file dialog

commit c1ff24590084d0b6b93f92d9fc283eb033ee5b03
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 9 15:56:30 2015 +1000

    Add propertiesUTF8 support for upload documents

commit 9f5183f4b788afca8c532e8ef3a0f1e45ad39e60
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 8 16:34:01 2015 +1000

    Update zanata-commin version, implement PropertiesAdapter

commit 111eb988a5276a14a9dee0c8573e3c0b380c2b7c
Merge: 1e20372 307b890
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 08:51:05 2015 +1000

    Merge branch 'integration/master' into rhbz1186972

commit 1e20372da46513b8359b6c60e4e835362d1f8f19
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 15:40:58 2015 +1000

    WIP: creating PropertiesAdapter and GettextAdapter

commit 99d50df573a23215bc21b45e24772edf0b912b19
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 15:40:49 2015 +1000

    WIP: creating PropertiesAdapter and GettextAdapter


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

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java

  Log Message:
  -----------
  Update Liquibase to 3.3.3


  Commit: 78903fc0751b1bd6f8766d3900b1b6191e011036
      https://github.com/zanata/zanata-server/commit/78903fc0751b1bd6f8766d3900b1b6191e011036
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/config/remote-deps.groovy
    R zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    A zanata-overlay/distros/wildfly-9/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml

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

Conflicts:
	pom.xml


  Commit: cadd86e716872416649ee7653531ff8e4b81420e
      https://github.com/zanata/zanata-server/commit/cadd86e716872416649ee7653531ff8e4b81420e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    A docs/images/admin-manage-search.png
    A docs/images/admin-monitoring.png
    A docs/images/admin-process-manager.png
    A docs/images/admin-settings-client.png
    A docs/images/admin-settings-email-log.png
    A docs/images/admin-settings-general.png
    A docs/images/admin-settings-piwik.png
    A docs/images/admin-statistics.png
    M docs/release-notes.md
    M docs/user-guide/admin/admin-overview.md
    A docs/user-guide/admin/manage-search.md
    A docs/user-guide/admin/monitoring.md
    A docs/user-guide/admin/process-manager.md
    A docs/user-guide/admin/server-config.md
    A docs/user-guide/admin/statistic.md
    M mkdocs.yml

  Log Message:
  -----------
  Include documentation for admin


  Commit: 6c4e44e4bdcea0bee39d55db489a6868714776f5
      https://github.com/zanata/zanata-server/commit/6c4e44e4bdcea0bee39d55db489a6868714776f5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

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

  Log Message:
  -----------
  Merge pull request #799 from zanata/jndi-resource-ref

Declare required resources in jboss-web.xml


  Commit: 75849c6ef87241d1b5b064ba08dd32130ddd8e61
      https://github.com/zanata/zanata-server/commit/75849c6ef87241d1b5b064ba08dd32130ddd8e61
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Downgrade WildFly to fix deployment problem


  Commit: d05665e448af9564a399f60a416c401a55cdbae3
      https://github.com/zanata/zanata-server/commit/d05665e448af9564a399f60a416c401a55cdbae3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    A docs/images/admin-manage-search.png
    A docs/images/admin-monitoring.png
    A docs/images/admin-process-manager.png
    A docs/images/admin-settings-client.png
    A docs/images/admin-settings-email-log.png
    A docs/images/admin-settings-general.png
    A docs/images/admin-settings-piwik.png
    A docs/images/admin-statistics.png
    M docs/release-notes.md
    M docs/user-guide/admin/admin-overview.md
    A docs/user-guide/admin/manage-search.md
    A docs/user-guide/admin/monitoring.md
    A docs/user-guide/admin/process-manager.md
    A docs/user-guide/admin/server-config.md
    A docs/user-guide/admin/statistic.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #805 from zanata/doc-admin

Include documentation for admin


  Commit: 57b6249d7835caa2bd89f18f9bb6a010d45be87e
      https://github.com/zanata/zanata-server/commit/57b6249d7835caa2bd89f18f9bb6a010d45be87e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java

  Log Message:
  -----------
  Merge pull request #761 from zanata/liquibase33

Update Liquibase to 3.3.3


  Commit: 8281d5f8bae8325d4171bd9967a8d5b1d136da9b
      https://github.com/zanata/zanata-server/commit/8281d5f8bae8325d4171bd9967a8d5b1d136da9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    A docs/images/editor-translation-history-comparison.png
    A docs/images/glossary-edit-windows.png
    A docs/images/glossary-panel.png
    M docs/release-notes.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    A docs/user-guide/editor/project-search-replace-view.md
    M docs/user-guide/editor/translation-history.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/glossary-roles-permissions.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/project-settings.md
    M mkdocs.yml

  Log Message:
  -----------
  Fix broken link and images


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

  Changed paths:
    A docs/images/editor-translation-history-comparison.png
    A docs/images/glossary-edit-windows.png
    A docs/images/glossary-panel.png
    M docs/release-notes.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    A docs/user-guide/editor/project-search-replace-view.md
    M docs/user-guide/editor/translation-history.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/glossary-roles-permissions.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/project-settings.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #806 from zanata/fix-doc

Fix broken link and images


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.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/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/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/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/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.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/projects/projectsettings/ProjectWebHooksTab.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/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.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/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.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/administration/AutoRoleAssignmentTest.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/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.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/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.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/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml

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

commit d8f00669cb49c9d3bcb22cf31f7c072d84ee15a6
Author: Damian Jansen <djansen at redhat.com>
Date:   Wed May 13 09:26:25 2015 +1000

    Fix tests broken in disable-implicit-wait merge

commit a681d4e844d980802135738fcda05ddfe47bda4e
Author: Damian Jansen <djansen at redhat.com>
Date:   Tue May 12 13:02:26 2015 +1000

    Cleanup on merge to master

commit 4941f18bbee5332a48af01f6eddfd8b5a6d2e50c
Author: Damian Jansen <djansen at redhat.com>
Date:   Mon May 11 11:14:33 2015 +1000

    Add a remove notifications step

    Notifications were getting in the way, on occasion. Remove them before
    proceeding with clicks.

commit ab18e760460c4a84b7fd29f473531d801045748f
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri May 8 13:55:56 2015 +1000

    Fix more timing failures in tests

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/BasePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java

commit c8fe7d401e7f1926ebf74ee0c2f4fd782c601ea1
Author: Damian Jansen <djansen at redhat.com>
Date:   Thu May 7 12:56:18 2015 +1000

    Rename expect to ready/existing

    In tests it's clearer to see what's being acted upon, a ready
    element or merely an existing one.

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/CorePage.java
    	functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    	functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    	functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    	functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    	functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

commit c57bb2efd1adc641ba4a0433418c1ae44382271d
Author: Damian Jansen <djansen at redhat.com>
Date:   Thu May 7 09:53:55 2015 +1000

    Fix admin tests due to removal of implicit wait

commit 5c73d6d9f8a2e67db3483739b3b57bb0cf5d5a4c
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 16:44:18 2015 +1000

    Wait for page silence then simply check condition

    Instead of waiting for a condition to be true, and eventually throwing
    a TimeoutException if it is never true, we waitForPageSilence() and
    then check the condition, which will allow for more meaningful error
    messages.

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/BasePage.java
    	functional-test/src/main/java/org/zanata/page/CorePage.java
    	functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    	functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    	functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    	functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    	functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    	functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    	functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    	functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    	functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    	functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    	functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    	functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    	functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    	functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    	functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

commit 2835c5c78ffe2b97b4fc3c0328ec14c9eb6fbc63
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 12:41:42 2015 +1000

    Avoid reusing FluentWait to avoid stale messages

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

commit a518a6ff69a93fad5917518e10651a1fbd9a4b09
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 11:41:41 2015 +1000

    Increase timeout from 10 to 20 seconds

commit 703b8dfdedbf77ea5ecdd160fccbae7ee6e99466
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 17 15:53:34 2015 +1000

    Wait for page silence after defocus

commit ff636fb6275f39b7aba2e580513ba25bb61b66dc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 17 14:04:47 2015 +1000

    Disable implicit wait in Selenium tests


  Commit: 03e781225ee213f16d83ebd2c285042e004d673f
      https://github.com/zanata/zanata-server/commit/03e781225ee213f16d83ebd2c285042e004d673f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

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

  Log Message:
  -----------
  Re-enable critical error check on page load


  Commit: 6e06911e56a2adee5e49d8d4e2498a8e9251811d
      https://github.com/zanata/zanata-server/commit/6e06911e56a2adee5e49d8d4e2498a8e9251811d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

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

  Log Message:
  -----------
  Wait for page silence after defocus


  Commit: 003ed3132d068c1c8c30013917058ade09ecc2ad
      https://github.com/zanata/zanata-server/commit/003ed3132d068c1c8c30013917058ade09ecc2ad
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    A docs/images/glossary-options.png
    M docs/user-guide/glossary/delete-glossaries.md
    M mkdocs.yml

  Log Message:
  -----------
  Fix missing pic and link for glossary


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

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  rhbz1211849 - update jsf to allow slug change in project page


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

  Changed paths:
    A zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/SlugUpdatedListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java

  Log Message:
  -----------
  rhbz1211849 - changing project slug will reindex HTextFlowTarget


  Commit: 8e2d7f3aebb48692016dfd1c8c2b9f2fda914e45
      https://github.com/zanata/zanata-server/commit/8e2d7f3aebb48692016dfd1c8c2b9f2fda914e45
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SlugUpdatedListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  rhbz1211849 - enable version slug change


  Commit: 547412a4f49d924785f201318d4909354a87706e
      https://github.com/zanata/zanata-server/commit/547412a4f49d924785f201318d4909354a87706e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java

  Log Message:
  -----------
  remove lucene index on project iteration slug

it was only used by project wide search using lucene which has been
disabled for a long time. Reasons that I can rememeber:
- it can not handle some edge case properly. e.g. search term contains
  space or some special character


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    M zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    M zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java
    R zanata-war/src/main/java/org/zanata/service/impl/SlugUpdatedListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java

  Log Message:
  -----------
  rhbz1211849 - refactor hibernate listener and implement notification to existing workspace


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

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

  Log Message:
  -----------
  rhbz1211849 - fix potential concurrent problem in SlugEntityUpdatedListener


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  rhbz1211849 - fix issues in review


  Commit: 31b899d6f681dc7e3a9472aab15583804686a888
      https://github.com/zanata/zanata-server/commit/31b899d6f681dc7e3a9472aab15583804686a888
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java

  Log Message:
  -----------
  rhbz1211849 - refactor and add functional test for slug change


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  rhbz1211849 - add functional test for changing slug


  Commit: 9745c4fa04e5e0f3fd2f55268703c3156690acf2
      https://github.com/zanata/zanata-server/commit/9745c4fa04e5e0f3fd2f55268703c3156690acf2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  change script to handle jquery found no js-loader in firefox


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

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

  Log Message:
  -----------
  rhbz1211849 - add validation to slug change and fix errors


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

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

  Log Message:
  -----------
  rhbz1211849 - remove autosave when slug change happen just do warning


  Commit: 72b0423c1ee6496285549181439254adf05ad494
      https://github.com/zanata/zanata-server/commit/72b0423c1ee6496285549181439254adf05ad494
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  rhbz1211849 - only validate slug when it changed


  Commit: 549ac4b5126571b72c59832c0d86999bb92aad0d
      https://github.com/zanata/zanata-server/commit/549ac4b5126571b72c59832c0d86999bb92aad0d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  rhbz1211849 - fix autosave when slug changed


  Commit: 4995a027ab73f0b1e2ea734fc5a7db43b92ee37d
      https://github.com/zanata/zanata-server/commit/4995a027ab73f0b1e2ea734fc5a7db43b92ee37d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    M zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.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/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.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/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java

  Log Message:
  -----------
  Merge pull request #796 from zanata/rhbz1211849-change-slug

Rhbz1211849 change slug


  Commit: 81beb4a088ddfb1b1657d9f257bfdba1b63ff925
      https://github.com/zanata/zanata-server/commit/81beb4a088ddfb1b1657d9f257bfdba1b63ff925
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    A docs/images/glossary-options.png
    M docs/user-guide/glossary/delete-glossaries.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #807 from zanata/fix-doc

Fix missing pic and link for glossary


  Commit: 05d4a52a7bc0db5838743da3d69d666b6dc4de4b
      https://github.com/zanata/zanata-server/commit/05d4a52a7bc0db5838743da3d69d666b6dc4de4b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  Merge pull request #778 from zanata/check-critical-errors

Re-enable critical error check on page load


  Commit: b133621822e3e9678f8f606f0429a24762133e66
      https://github.com/zanata/zanata-server/commit/b133621822e3e9678f8f606f0429a24762133e66
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-war/src/etc/h2.properties
    M zanata-war/src/etc/mysql.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/components.properties
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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

commit d46ede1cd661e9e4531ae6e2b3cc7ed7d7943ca3
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu May 14 15:10:29 2015 +1000

    Remove persistence-unit-name from components.properties

commit e2e00ff455b106beda5c540ed2c31224d52c44a0
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu May 14 14:11:30 2015 +1000

    Update to WildFly 9.0.0.CR1 again

    - Add jboss-web.xml to Arquillian deployments to ensure JNDI resources
      are initialised.
    - Rename zanataTestDatasource to zanataDatasource to match jboss-web.xml.
    - Rename zanataTestDatasourcePU to zanataDatasourcePU
    - Remove ds.jndi.name property.


  Commit: 01a7c0b0bb3626acb20459dc10a75de577314d0e
      https://github.com/zanata/zanata-server/commit/01a7c0b0bb3626acb20459dc10a75de577314d0e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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

commit 754d40b42df9edbc05c40c84eaa71019ffbf8e29
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu May 14 17:07:56 2015 +1000

    Comment the logger config in standalone.xml files

commit e7c6b5b38ae2fb0e4b66742690d7d292fdc7c703
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 30 18:13:23 2015 +1000

    Log every request URI

commit 20ecbcd5bce19f5870f31bb56436bd611e8b010f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 30 18:13:02 2015 +1000

    Testing config: log connection allocations in Hibernate


  Commit: 8fad6df416c767dc26bf6014195b907721d65154
      https://github.com/zanata/zanata-server/commit/8fad6df416c767dc26bf6014195b907721d65154
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M CONTRIBUTING.md

  Log Message:
  -----------
  Add -DstaticAnalysis to CONTRIBUTING.md


  Commit: 6ccdee6ace7479352a58c4931f312d9ae3a7e50a
      https://github.com/zanata/zanata-server/commit/6ccdee6ace7479352a58c4931f312d9ae3a7e50a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    A zanata-war/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java

  Log Message:
  -----------
  Add workaround for Liquibase CORE-2024


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

  Changed paths:
    A zanata-war/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java

  Log Message:
  -----------
  Merge pull request #811 from zanata/liquibase-CORE-2024-workaround

Add workaround for Liquibase CORE-2024


  Commit: 26a01adbf509c499eec4a22410ceba27c39574b5
      https://github.com/zanata/zanata-server/commit/26a01adbf509c499eec4a22410ceba27c39574b5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ProfilePage.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/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.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/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/Constants.java

  Log Message:
  -----------
  Fix functional test compiler warnings


  Commit: bbca366c2899b2f8224172e558c0c0a799a6f7d6
      https://github.com/zanata/zanata-server/commit/bbca366c2899b2f8224172e558c0c0a799a6f7d6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    A zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    A zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    A zanata-war/src/main/java/org/zanata/seam/framework/Home.java
    A zanata-war/src/main/java/org/zanata/seam/framework/MutableController.java
    A zanata-war/src/main/java/org/zanata/seam/framework/PersistenceController.java

  Log Message:
  -----------
  Add internal version of Seam Home components.

Pull Request: https://github.com/zanata/zanata-server/pull/809

Squashed commit of the following:

commit d7fd4887a639075a3782b8a03525345419375493
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu May 14 15:51:51 2015 +1000

    Change the style and placement "copied from" comments for Seam classes.

commit f53b149dcb63327346246638f74b00ed27493192
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu May 14 15:45:32 2015 +1000

    Remove source URL from Seam duplicated classes.

    These urls may be incorrect.

commit 5bbe4b333a2ffc4a7dd9da3a040cdae9336f971c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu May 14 14:28:06 2015 +1000

    Add internal version of Seam Home components.

    This is a temporary solution to allow for the migration to CDI from Seam.
    Once the migration happens, these classes should be considered for refactoring or elimination.


  Commit: 091e908592884503930fc70b0141292ed9726e63
      https://github.com/zanata/zanata-server/commit/091e908592884503930fc70b0141292ed9726e63
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Bump Selenium version to 2.45

Latest Firefox does not work with versions previous
Requires httpclient 4.3.6, httpcore 4.3.3.


  Commit: 169c1590f8edffab16d7380d57d33c4ebf7a2d8f
      https://github.com/zanata/zanata-server/commit/169c1590f8edffab16d7380d57d33c4ebf7a2d8f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Merge pull request #815 from zanata/selenium-245

Bump Selenium version to 2.45


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/profile/js/bundle.min.js

  Log Message:
  -----------
  rhbz1222358 - fix user profile page dropdown not working in firefox


  Commit: 53417cf3fa5374f96ddf1d9b0abe14c56ff59ec0
      https://github.com/zanata/zanata-server/commit/53417cf3fa5374f96ddf1d9b0abe14c56ff59ec0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.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/TransUnitCountBar.java
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml

  Log Message:
  -----------
  Update statistic for approved and translated status

https://bugzilla.redhat.com/show_bug.cgi?id=1209670

Squashed commit of the following:

commit 621ed68284330b53704e9991341d61ab57bb9f7b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 10:22:04 2015 +1000

    Update release notes

commit 34d1aefb09e5dab016f85c3a2062727e6c924c5f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 15 08:39:50 2015 +1000

    Change 'translated' count to include 'approved' in statistic

commit 943a203bf6bfb05c73f96e6528947e2823c14fff
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 14 13:26:21 2015 +1000

    WIP: change translated statistic to translated + approved


  Commit: c970d50b3bd884203446bd44214ee3ffdfb4b33f
      https://github.com/zanata/zanata-server/commit/c970d50b3bd884203446bd44214ee3ffdfb4b33f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M docs/user-guide/projects/project-settings.md
    R 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/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/HomePage.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    R zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/events/HomeContentChangedEvent.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateSeamTextToCommonMark.java
    A zanata-war/src/main/java/org/zanata/seam/text/SeamTextLexer.java
    A zanata-war/src/main/java/org/zanata/seam/text/SeamTextParser.java
    A zanata-war/src/main/java/org/zanata/seam/text/SeamTextParserTokenTypes.java
    A zanata-war/src/main/java/org/zanata/seam/text/SeamTextParserTokenTypes.txt
    A zanata-war/src/main/java/org/zanata/seam/text/SeamTextToCommonMarkParser.java
    A zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    A zanata-war/src/main/java/org/zanata/util/HtmlUtil.java
    A zanata-war/src/main/resources/META-INF/resources/script/commonmark-0.18.1.min.js
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    R zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/main/webapp/resources/script/commonmark-preview.js
    A zanata-war/src/test/groovy/org/zanata/MigrateSeamTextToCommonMarkTest.groovy
    R zanata-war/src/test/java/org/zanata/email/EmailUtilTest.java
    A zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  Replace Seam Text with CommonMark Markdown

Squashed commit of the following:

commit 376cd66338c101c93aa57d20762b62e7fc540ecf
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 15 14:44:13 2015 +1000

    Fix typo in unconverted text note

commit 3a72a7d6ddc72c4e001be6ac2926f37375a3b0c3
Merge: 4e8154a 8fad6df
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 15 13:44:46 2015 +1000

    Merge remote-tracking branch 'origin/master' into remove-seam-text

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    	functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    	functional-test/src/main/java/org/zanata/page/utility/HomePage.java

commit 4e8154ae40379a1dba8e3af2a483f9ac725bc0d5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue May 12 16:26:43 2015 +1000

    Add pre and table tags to whitelist

commit 9ae3d5895de9683ddd2e9cef4e38baf07a5801fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue May 12 14:10:42 2015 +1000

    Fix compilation error

commit 34b5f77b20205b968e2162157189b62180cdf1d3
Merge: 4133a1d 847501d
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue May 12 14:04:37 2015 +1000

    Merge remote-tracking branch 'origin/master' into remove-seam-text

commit 4133a1dd34ac1701bbdada8f50be3a7db5520fb6
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 8 15:20:01 2015 +1000

    Reword the note added before unconverted text

commit 89fe0c80eb3dffb792ff4db9534b125aa0d74021
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 8 14:21:00 2015 +1000

    Correct counter in log message

commit d64c84d7d0a52878ac2cd8b67727d75e4c9345d7
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 8 10:39:09 2015 +1000

    Add primary key so ResultSet.CONCUR_UPDATABLE works

commit d8234eb57b947f72d6f70fd96837c13a87bca9ec
Merge: bce0a07 a5b7b9e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 8 09:51:56 2015 +1000

    Merge remote-tracking branch 'origin/master' into remove-seam-text

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    	zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    	zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    	zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

commit bce0a07210e73eae8b7d7d1d22d1be734251c69f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 10 15:36:39 2015 +1000

    Add MigrateSeamTextToCommonMark for Liquibase

commit fd48e209853a31de16a2dd3fc883a10635655978
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 2 14:10:17 2015 +1000

    Rename CommonMarkRenderer.getCommonMarkImpl to CommonMarkRenderer.getScriptName

commit bbe942cd446d2282ee0d4fbadcb1b332dc35b15c
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Mar 27 14:35:34 2015 +1000

    Add Seam Text to CommonMark Markdown converter

commit 36ee0a10fbb9e720c9006293503a8fda462938ba
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Mar 18 13:25:26 2015 +1000

    Update JavaDocs

commit 8b14e5a7134acd0554fbd3b79ff947044372d8da
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Mar 18 13:02:19 2015 +1000

    Fix CommonMark conversion for double-backslash in Seam Text

commit c9e99eeb4c9e01b55e4546afbce47990e5ba2bf5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Mar 18 12:56:50 2015 +1000

    Add basic unit test for CommonMarkRenderer; whitelist <em> elements

commit 71b5434cb73c7a0f4354c194cc1c96e2bbda89f6
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Mar 18 12:59:25 2015 +1000

    Remove obsolete Page from functional-test

commit 0710e4b251d328f8c38173801f5149e5f99fb907
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 15:34:31 2015 +1000

    Move commonmark.js into META-INF/resources to avoid need for ServletContext

commit ba3fa067ff62f09f7caf42cef4970456b32cc802
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 14:08:43 2015 +1000

    Update user guide to refer to CommonMark, not Seam Text

commit fce646b617a971e921fd9cfdbdc67087aa75b1a7
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 14:01:44 2015 +1000

    Fix dependency problem

commit 3873e457dc6b0cad90277513f9cb78704426abf1
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 13:44:50 2015 +1000

    Update functional tests for CommonMark, fix duplicate element id

commit e7e222bd3eccbcf50aed6664cbafecd11b3a88fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 12:51:00 2015 +1000

    Reformat Seam Text implementation

commit 8c024b835d74455579ee151732bac7136ceccc19
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 11:50:24 2015 +1000

    Modify SeamTextParser to allow different output

commit 256a50a0882a82cfe1ec805ad16845a01b8e7409
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 17 11:46:09 2015 +1000

    Import Seam Text implementation from Seam 2.3.1

commit 1d3281da1b8b4d728e7d06e09649e5a0b7a4c8fc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Mar 13 10:30:27 2015 +1000

    Implement live preview and server-side rendering for project page content

commit 07b31b32aac8340ac87b1af0e0bfa7098260429d
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Mar 12 17:08:43 2015 +1000

    Implement live preview and server-side rendering for home page content

commit 1ef9b3a6e90cb6fc70ee4e4c5f3f982f70b1eec6
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 10 18:05:09 2015 +1000

    Rename EmailUtil to HtmlUtil

commit 597ad776f85c5097a0cad95e8fd59c7e0a4e8f81
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Mar 3 17:21:23 2015 +1000

    Render home page in JS as CommonMark (MarkDown), not Seam Text


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/profile/js/bundle.min.js

  Log Message:
  -----------
  Merge pull request #817 from zanata/rhbz1222358-user-profile

rhbz1222358 - fix user profile page dropdown not working in firefox


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes for rhbz1198433 (Seam Text)


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

  Changed paths:
    M docs/release-notes.md
    A zanata-war/src/main/java/org/zanata/dao/AccountOptionDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java

  Log Message:
  -----------
  Fix save editor option

https://bugzilla.redhat.com/show_bug.cgi?id=1222710

Squashed commit of the following:

commit 8db6ac44cae33a9cf21364130962b997f4433ac1
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 13:14:02 2015 +1000

    Add notification for save options, load options and restore to default options

commit 5924c54acf92dd4095ccfea151a7280445f85f4c
Merge: 2e68ba0 a149bba
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 12:34:35 2015 +1000

    Merge branch 'integration/master' into rhbz1222710

commit 2e68ba0b69d80c736dc6823373eccc3fffdf62b2
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 10:54:56 2015 +1000

    Changed load user option message

commit fe75a583475f9cd09a11d82ea42b445b25aeb37f
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 08:55:21 2015 +1000

    Fix save editor option: https://bugzilla.redhat.com/show_bug.cgi?id=1222710


  Commit: 575aa29ee95daba78b068a83072c514e83fd49c8
      https://github.com/zanata/zanata-server/commit/575aa29ee95daba78b068a83072c514e83fd49c8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.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/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

  Log Message:
  -----------
  Enable review feature in editor
https://bugzilla.redhat.com/show_bug.cgi?id=1211134

Squashed commit of the following:

commit 31e5a14390220c4dc4af706dcd37c60ba51606b9
Merge: ec95d13 ee7b454
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 13:15:28 2015 +1000

    Merge branch 'integration/master' into rhbz1211134

commit ec95d13843b8219cc494793165a4ee09906992b7
Merge: 4f401de a149bba
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 19 13:14:38 2015 +1000

    Merge branch 'integration/master' into rhbz1211134

commit 4f401de7260cf8550a350e58261cbe6dda51d524
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 14:28:04 2015 +1000

    Enable review feature in editor: https://bugzilla.redhat.com/show_bug.cgi?id=1211134


  Commit: 73a9960014d1ebc577325c385786618cb0385e3d
      https://github.com/zanata/zanata-server/commit/73a9960014d1ebc577325c385786618cb0385e3d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
    M zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/ULowerCaseFilter.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/po/PoHeaderBase.java
    M zanata-model/src/main/java/org/zanata/model/type/ConditionRuleActionType.java
    A zanata-model/src/main/java/org/zanata/model/type/ConditionRuleActionTypeDescriptor.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityStatusType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityStatusTypeDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/RoleTypeDescriptor.java
    M zanata-model/src/main/java/org/zanata/model/type/RoleTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/SingleCharEnumTypeDescriptor.java
    M zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java

  Log Message:
  -----------
  Update deprecated reference

Squashed commit of the following:

commit 7d4c29c87283f4ddf07447f9679b4a373a41bda4
Author: Alex Eng <aeng at redhat.com>
Date:   Wed May 20 13:43:40 2015 +1000

    Rename descriptor to be more generic

commit a15bb72801b9b752ca4b60dff202e015fb385d15
Author: Alex Eng <aeng at redhat.com>
Date:   Wed May 20 09:48:25 2015 +1000

    Add enum descriptor for enum type

commit ceae31601881dd1a2ee48ee0b11c5892ac776939
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 15:41:42 2015 +1000

    Remove unused test class

commit da82cff61a8db4be2f3b6973acae2aefebe601d0
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 13:18:42 2015 +1000

    Convert Immutable to AbstractSingleColumnStandardBasicType

commit b0e56cf2f4dfa9b5063cb7f7e7240bdfe8a8703a
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 11:33:58 2015 +1000

    Update deprecated reference


  Commit: 0b8e0eb01f2f768cbb64face6c46af44309f7d9a
      https://github.com/zanata/zanata-server/commit/0b8e0eb01f2f768cbb64face6c46af44309f7d9a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ProfilePage.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/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.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/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java

  Log Message:
  -----------
  Merge pull request #813 from zanata/fix-ft-compiler-warnings

Fix functional test compiler warnings


  Commit: 7292bafa714a93c49d6864a147303c08c3ccc4eb
      https://github.com/zanata/zanata-server/commit/7292bafa714a93c49d6864a147303c08c3ccc4eb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.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/VersionHome.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml

  Log Message:
  -----------
  rhbz1082840 - delete version and project


  Commit: df6ce292c7bb59f7cc6c661092f8d4324359110b
      https://github.com/zanata/zanata-server/commit/df6ce292c7bb59f7cc6c661092f8d4324359110b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml

  Log Message:
  -----------
  Update functional tests for project deletion


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

  Changed paths:
    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/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml

  Log Message:
  -----------
  rhbz1082840 - fix issues in copy version and search deleted version


  Commit: 75679449edc2b85713333197cc5b1f9d27861462
      https://github.com/zanata/zanata-server/commit/75679449edc2b85713333197cc5b1f9d27861462
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

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

  Log Message:
  -----------
  rhbz1082840 - make HTextFlowTarget toString method more robust


  Commit: 1e52e6a38c6f16ab0274c2fede25959b46184c85
      https://github.com/zanata/zanata-server/commit/1e52e6a38c6f16ab0274c2fede25959b46184c85
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.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/VersionHome.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  rhbz1082840 - fix according to review comment


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

  Changed paths:
    M .gitignore
    A frontend/pom.xml
    A frontend/src/main/javascript/index.js
    A frontend/src/main/javascript/package.json
    M pom.xml

  Log Message:
  -----------
  add a frontend module and make use of frontend-maven-plugin to build


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

  Changed paths:
    A frontend/src/main/javascript/user-profile-page/README.md
    A frontend/src/main/javascript/user-profile-page/copy.sh
    A frontend/src/main/javascript/user-profile-page/index.html
    A frontend/src/main/javascript/user-profile-page/index.js
    A frontend/src/main/javascript/user-profile-page/lib/actions/Actions.js
    A frontend/src/main/javascript/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/ContentStateFilter.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/ContributionChart.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/DayMatrix.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/DropDown.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/javascript/user-profile-page/lib/components/RecentContributions.jsx
    A frontend/src/main/javascript/user-profile-page/lib/constants/ActionTypes.js
    A frontend/src/main/javascript/user-profile-page/lib/constants/Configs.js
    A frontend/src/main/javascript/user-profile-page/lib/constants/Options.js
    A frontend/src/main/javascript/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/javascript/user-profile-page/lib/stores/UserMatrixStore.js
    A frontend/src/main/javascript/user-profile-page/lib/stores/__mocks__/superagent.js
    A frontend/src/main/javascript/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/javascript/user-profile-page/lib/stores/userStats.json
    A frontend/src/main/javascript/user-profile-page/lib/utils/DateHelper.js
    A frontend/src/main/javascript/user-profile-page/package.json
    A frontend/src/main/javascript/user-profile-page/preprocessor.js
    A frontend/src/main/javascript/user-profile-page/server.js
    A frontend/src/main/javascript/user-profile-page/webpack.config.js
    A frontend/src/main/javascript/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  copy over user profile page source code


  Commit: 3c3d9a7530117460c6211746a69487e72d626693
      https://github.com/zanata/zanata-server/commit/3c3d9a7530117460c6211746a69487e72d626693
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

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

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


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

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp/profile/home.xhtml
    R zanata-war/src/main/webapp/profile/js/bundle.min.js

  Log Message:
  -----------
  remove binary profile page bundle and make use of the frontend module artifact


  Commit: 55697bcff419ae022abdb8cc4e45209280bd603b
      https://github.com/zanata/zanata-server/commit/55697bcff419ae022abdb8cc4e45209280bd603b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-25 (Mon, 25 May 2015)

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

  Log Message:
  -----------
  Ensure UTF-8 when reading commonmark.min.js


  Commit: a42dac51061be17149694c22c7cc04bfcee93243
      https://github.com/zanata/zanata-server/commit/a42dac51061be17149694c22c7cc04bfcee93243
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml

  Log Message:
  -----------
  Hide copy from previous version with empty version in a project


  Commit: 90d18f01a1efdd6a071d52dd4c52f3fa0d58021e
      https://github.com/zanata/zanata-server/commit/90d18f01a1efdd6a071d52dd4c52f3fa0d58021e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

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

  Log Message:
  -----------
  Merge pull request #826 from zanata/commonmark-utf8

rhbz1224594 Ensure UTF-8 when reading commonmark.min.js


  Commit: d33de729d4dbb4089327e38f96f6c49aa7c30702
      https://github.com/zanata/zanata-server/commit/d33de729d4dbb4089327e38f96f6c49aa7c30702
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml

  Log Message:
  -----------
  Merge pull request #828 from zanata/rhbz1165930

Hide copy from previous version with only obsolete version


  Commit: 6a02ca86090a24fe6a6eebef63eafe967094fff2
      https://github.com/zanata/zanata-server/commit/6a02ca86090a24fe6a6eebef63eafe967094fff2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java

  Log Message:
  -----------
  Encode docId for download action in webtrans


  Commit: 3991bfae728607aa3de7a882e65adc107d372ee8
      https://github.com/zanata/zanata-server/commit/3991bfae728607aa3de7a882e65adc107d372ee8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/system-admin/configuration/installation.md
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    R zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java

  Log Message:
  -----------
  Use JNDI to obtain mail server from app server

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

Squashed commit of the following:

commit a7d082ea24312eacc83d8df0f22960a79c4576e3
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon May 25 16:15:47 2015 +1000

    Update release notes and docs for mail config

commit 2ea59a0786798c63417ae63ae73a5abd2700dafc
Merge: a9a4d41 73a9960
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 21 09:36:39 2015 +1000

    Merge branch 'integration/master' into use-jndi-for-mail

    Conflicts:
    	zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    	zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

commit a9a4d41f7b7047d6b54667af26cfd86fc3e7dc43
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Nov 10 17:34:26 2014 +1000

    Use JNDI to obtain mail server from app server


  Commit: 7cb22eafe646bfeb6fd9672c68092780c740d1a3
      https://github.com/zanata/zanata-server/commit/7cb22eafe646bfeb6fd9672c68092780c740d1a3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  rhbz1082840 - user need to type in the name again to confirm delete


  Commit: 752b6f2c22db3283e57f8c03571035f64713231a
      https://github.com/zanata/zanata-server/commit/752b6f2c22db3283e57f8c03571035f64713231a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.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/view/AppView.java
    M zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/login.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/app/index.html
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  add pseudo class 'app-error' to all legit error message classes so that we can select them using css selector in tests


  Commit: 91298413d8394fca6c68d7640f9a61ee2f3f2b53
      https://github.com/zanata/zanata-server/commit/91298413d8394fca6c68d7640f9a61ee2f3f2b53
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    A frontend/src/main/assets/index.js
    A frontend/src/main/assets/package.json
    A frontend/src/main/assets/user-profile-page/README.md
    A frontend/src/main/assets/user-profile-page/copy.sh
    A frontend/src/main/assets/user-profile-page/index.html
    A frontend/src/main/assets/user-profile-page/index.js
    A frontend/src/main/assets/user-profile-page/lib/actions/Actions.js
    A frontend/src/main/assets/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/ContentStateFilter.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/ContributionChart.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/DayMatrix.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/DropDown.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/assets/user-profile-page/lib/components/RecentContributions.jsx
    A frontend/src/main/assets/user-profile-page/lib/constants/ActionTypes.js
    A frontend/src/main/assets/user-profile-page/lib/constants/Configs.js
    A frontend/src/main/assets/user-profile-page/lib/constants/Options.js
    A frontend/src/main/assets/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/assets/user-profile-page/lib/stores/UserMatrixStore.js
    A frontend/src/main/assets/user-profile-page/lib/stores/__mocks__/superagent.js
    A frontend/src/main/assets/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/assets/user-profile-page/lib/stores/userStats.json
    A frontend/src/main/assets/user-profile-page/lib/utils/DateHelper.js
    A frontend/src/main/assets/user-profile-page/package.json
    A frontend/src/main/assets/user-profile-page/preprocessor.js
    A frontend/src/main/assets/user-profile-page/server.js
    A frontend/src/main/assets/user-profile-page/webpack.config.js
    A frontend/src/main/assets/user-profile-page/webpack.prod.config.js
    R frontend/src/main/javascript/index.js
    R frontend/src/main/javascript/package.json
    R frontend/src/main/javascript/user-profile-page/README.md
    R frontend/src/main/javascript/user-profile-page/copy.sh
    R frontend/src/main/javascript/user-profile-page/index.html
    R frontend/src/main/javascript/user-profile-page/index.js
    R frontend/src/main/javascript/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/javascript/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/javascript/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/javascript/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/javascript/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/javascript/user-profile-page/lib/constants/Options.js
    R frontend/src/main/javascript/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/javascript/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/javascript/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/javascript/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/javascript/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/javascript/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/javascript/user-profile-page/package.json
    R frontend/src/main/javascript/user-profile-page/preprocessor.js
    R frontend/src/main/javascript/user-profile-page/server.js
    R frontend/src/main/javascript/user-profile-page/webpack.config.js
    R frontend/src/main/javascript/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  rename javascript folder to assets


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

  Changed paths:
    M frontend/pom.xml

  Log Message:
  -----------
  use maven exec plugin to invoke npm


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

  Changed paths:
    M frontend/pom.xml
    R frontend/src/main/assets/index.js
    R frontend/src/main/assets/package.json
    R frontend/src/main/assets/user-profile-page/README.md
    R frontend/src/main/assets/user-profile-page/copy.sh
    R frontend/src/main/assets/user-profile-page/index.html
    R frontend/src/main/assets/user-profile-page/index.js
    R frontend/src/main/assets/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/assets/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/assets/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/assets/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/assets/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/assets/user-profile-page/lib/constants/Options.js
    R frontend/src/main/assets/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/assets/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/assets/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/assets/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/assets/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/assets/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/assets/user-profile-page/package.json
    R frontend/src/main/assets/user-profile-page/preprocessor.js
    R frontend/src/main/assets/user-profile-page/server.js
    R frontend/src/main/assets/user-profile-page/webpack.config.js
    R frontend/src/main/assets/user-profile-page/webpack.prod.config.js
    A frontend/src/main/web/index.js
    A frontend/src/main/web/package.json
    A frontend/src/main/web/user-profile-page/README.md
    A frontend/src/main/web/user-profile-page/copy.sh
    A frontend/src/main/web/user-profile-page/index.html
    A frontend/src/main/web/user-profile-page/index.js
    A frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    A frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    A frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    A frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    A frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    A frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    A frontend/src/main/web/user-profile-page/lib/constants/Options.js
    A frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    A frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    A frontend/src/main/web/user-profile-page/package.json
    A frontend/src/main/web/user-profile-page/preprocessor.js
    A frontend/src/main/web/user-profile-page/server.js
    A frontend/src/main/web/user-profile-page/webpack.config.js
    A frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  rename assets folder to web


  Commit: 65292b9d68cc31d244d79aab4768dd071b216a54
      https://github.com/zanata/zanata-server/commit/65292b9d68cc31d244d79aab4768dd071b216a54
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  add server profile to build frontend conditionally


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java

  Log Message:
  -----------
  Merge pull request #829 from zanata/rhbz1098362

Encode docId for download action in webtrans


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml

  Log Message:
  -----------
  rhbz1082840 - fix functional test


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

  Changed paths:
    M frontend/pom.xml

  Log Message:
  -----------
  add locall downloaded node to exec-maven-plugin's PATH environment variables


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

  Changed paths:
    A frontend/npmWrapper.sh
    M frontend/pom.xml

  Log Message:
  -----------
  add shell script to set PATH and use local node


  Commit: 7ca0121c8549d0b5abdaf7d50881377dbbccce2e
      https://github.com/zanata/zanata-server/commit/7ca0121c8549d0b5abdaf7d50881377dbbccce2e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    R frontend/npmWrapper.sh
    M frontend/pom.xml

  Log Message:
  -----------
  remove shell script by using PATH variable


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/Token.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/TokenUtil.java
    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

  Log Message:
  -----------
  Fix non-encoded doc id in view


  Commit: 2bd32ae818e4efb8fe10c72d657c4e7cff7e27a8
      https://github.com/zanata/zanata-server/commit/2bd32ae818e4efb8fe10c72d657c4e7cff7e27a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/Token.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/TokenUtil.java
    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

  Log Message:
  -----------
  Merge pull request #831 from zanata/rhbz1225689

Fix non-encoded doc id in view


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  Disable require review option until https://bugzilla.redhat.com/show_bug.cgi?id=1211137


  Commit: 96c3b242ada8fa7e05ab97e1bd0715375c72c443
      https://github.com/zanata/zanata-server/commit/96c3b242ada8fa7e05ab97e1bd0715375c72c443
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignaler.java
    M zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignalerImpl.java

  Log Message:
  -----------
  Log start/finish for each Arquillian test


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #830 from zanata/disable-require-review

Disable require review option


  Commit: 8ac9d995bc4c05c7165cff250e77a07a4d830e5a
      https://github.com/zanata/zanata-server/commit/8ac9d995bc4c05c7165cff250e77a07a4d830e5a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.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/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.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/view/AppView.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/login.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/app/index.html
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Merge pull request #808 from zanata/rhbz1082840-del-proj-ver

Rhbz1082840 delete project or version


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 3.3.4


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

  Changed paths:
    M .gitignore
    A frontend/.gitignore
    R frontend/src/main/web/index.js
    R frontend/src/main/web/package.json
    M frontend/src/main/web/user-profile-page/README.md
    M frontend/src/main/web/user-profile-page/package.json

  Log Message:
  -----------
  change licence and add node_modules to gitignore to frontend module only


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  revert IDE reformated pom.xml


  Commit: 54a488aa62837acc20b7ce21b9050a7b16672ba3
      https://github.com/zanata/zanata-server/commit/54a488aa62837acc20b7ce21b9050a7b16672ba3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignaler.java
    M zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignalerImpl.java

  Log Message:
  -----------
  Merge pull request #832 from zanata/log-current-test

Log start/finish for each Arquillian test


  Commit: bcd1897cf8fe87588a09d80d737581ece039f6b8
      https://github.com/zanata/zanata-server/commit/bcd1897cf8fe87588a09d80d737581ece039f6b8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #834 from zanata/liquibase334

Upgrade to Liquibase 3.3.4


  Commit: 1e5f1b1a87acca1b87a1f798a0c1e89d5c5263e3
      https://github.com/zanata/zanata-server/commit/1e5f1b1a87acca1b87a1f798a0c1e89d5c5263e3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java

  Log Message:
  -----------
  Update username regular expression:

https://bugzilla.redhat.com/show_bug.cgi?id=981498


  Commit: 04edf7cdc80ccc81c51722efc5a2433865ef7cee
      https://github.com/zanata/zanata-server/commit/04edf7cdc80ccc81c51722efc5a2433865ef7cee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    A frontend/.gitignore
    A frontend/pom.xml
    A frontend/src/main/web/user-profile-page/README.md
    A frontend/src/main/web/user-profile-page/copy.sh
    A frontend/src/main/web/user-profile-page/index.html
    A frontend/src/main/web/user-profile-page/index.js
    A frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    A frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    A frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    A frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    A frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    A frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    A frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    A frontend/src/main/web/user-profile-page/lib/constants/Options.js
    A frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    A frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    A frontend/src/main/web/user-profile-page/package.json
    A frontend/src/main/web/user-profile-page/preprocessor.js
    A frontend/src/main/web/user-profile-page/server.js
    A frontend/src/main/web/user-profile-page/webpack.config.js
    A frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp/profile/home.xhtml
    R zanata-war/src/main/webapp/profile/js/bundle.min.js

  Log Message:
  -----------
  Merge pull request #825 from zanata/frontend-module

rhbz1222392 - Frontend module for all javascript projects


  Commit: 3daa552a673f703096d7a9049748f269534a8b83
      https://github.com/zanata/zanata-server/commit/3daa552a673f703096d7a9049748f269534a8b83
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java

  Log Message:
  -----------
  Merge pull request #835 from zanata/rhbz981498

Update username regular expression


  Commit: 6dac15a90321ee1bee88ee3246e9b734cc5fe310
      https://github.com/zanata/zanata-server/commit/6dac15a90321ee1bee88ee3246e9b734cc5fe310
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Redirect user to project page when self remove as maintainer

https://bugzilla.redhat.com/show_bug.cgi?id=1112498


  Commit: 39fd57d752b42a1b4e264128c34c89a8aa7886dc
      https://github.com/zanata/zanata-server/commit/39fd57d752b42a1b4e264128c34c89a8aa7886dc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

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

  Log Message:
  -----------
  Fix openid redirect issue:

https://bugzilla.redhat.com/show_bug.cgi?id=1098878

Squashed commit of the following:

commit e82fa395945f459d01891c42377770f08b96879f
Merge: 1a5fcd2 3daa552
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 1 16:05:42 2015 +1000

    Merge branch 'integration/master' into rhbz1098878

commit 1a5fcd2e632cc99f2ac8c8dae8610a613ab8461a
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 1 12:53:20 2015 +1000

    Redirect user to dashboard after openid login: https://bugzilla.redhat.com/show_bug.cgi?id=1098878


  Commit: 1b2c207a1c0ec9eea604a00311c665cb36ae3a12
      https://github.com/zanata/zanata-server/commit/1b2c207a1c0ec9eea604a00311c665cb36ae3a12
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    A zanata-model/src/main/java/org/zanata/hibernate/search/CaseInsensitiveWhitespaceAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java

  Log Message:
  -----------
  Improve project search in Zanata:

https://bugzilla.redhat.com/show_bug.cgi?id=1147304
https://bugzilla.redhat.com/show_bug.cgi?id=1123186

Squashed commit of the following:

commit d1c777862eb6988e1c380d3f788889d55e0352bf
Merge: d451d11 6dac15a
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 2 13:01:45 2015 +1000

    Merge branch 'integration/master' into rhbz1147304

commit d451d1138457c08a7cd076367aad8942940253cf
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 2 10:46:55 2015 +1000

    Use whitespace case insensitive analyser for project name and desc


  Commit: 4ca3c35f61c69073e8896bef37444b312111cfa6
      https://github.com/zanata/zanata-server/commit/4ca3c35f61c69073e8896bef37444b312111cfa6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  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/InactiveAccountPage.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/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.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/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/googleaccount/GoogleAccountPage.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/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.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/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java

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

commit 6a3bd26e34be2dd6579100e042b35aeb3c998eee
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri May 15 15:54:01 2015 +1000

    ClickElement replaces readyElement(element).click

    This forces all clicks to move the element into focus and wait for
    obstructions to be gone before proceeding.

commit c963b2767029134eac170661add97fba7b673191
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri May 15 15:20:44 2015 +1000

    Move non-Zanata-specific functions to AbstractPage


  Commit: 6c19620905205d3cd4ad85f25e9a946301f85fed
      https://github.com/zanata/zanata-server/commit/6c19620905205d3cd4ad85f25e9a946301f85fed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  Split large liquibase changeset into smaller tasks

https://bugzilla.redhat.com/show_bug.cgi?id=1207980

Squashed commit of the following:

commit a039b4c86910d4a57013eae2e1ddb6048e959502
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 2 13:43:27 2015 +1000

    Split index creation in 3.7 changelog

commit d484e54babd7bcc73e82a90a8d91f43a3e86021d
Merge: 22f549d 6dac15a
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 2 13:13:07 2015 +1000

    Merge branch 'integration/master' into rhbz1207980

commit 22f549d7d3ae7b96667c4702220fc5ba6c9646fa
Merge: df0739f d33de72
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 26 14:41:05 2015 +1000

    Merge branch 'integration/master' into rhbz1207980

commit df0739f8b91d61920b5993f6ea8bca254d486b3e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue May 26 10:46:02 2015 +1000

    Split liquibase changeset of HTextFlowTarget and History


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add notes for longer timeout in 3.7 deployment


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #841 from zanata/add-timeout-notes

Add notes for longer timeout in 3.7 deployment


  Commit: 21a6225b9b8eb8f5df0575cb0d1dbf0310fc2ffa
      https://github.com/zanata/zanata-server/commit/21a6225b9b8eb8f5df0575cb0d1dbf0310fc2ffa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

  Log Message:
  -----------
  bind cut and paste event for autocomplete input field: https://bugzilla.redhat.com/show_bug.cgi?id=1224030


  Commit: 3e0ec6ef4d72bf3731d43a2390144c3e61dc01c8
      https://github.com/zanata/zanata-server/commit/3e0ec6ef4d72bf3731d43a2390144c3e61dc01c8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/groovy/org/zanata/GroovyTest.groovy
    M zanata-war/src/test/groovy/org/zanata/MigrateSeamTextToCommonMarkTest.groovy
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    R zanata-war/src/test/groovy/org/zanata/ZanataTest.groovy
    M zanata-war/src/test/groovy/org/zanata/adapter/TranslatableSeparatorTest.groovy
    R zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/DBUnitDataExtractor.java
    M zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    A zanata-war/src/test/java/org/zanata/ZanataTest.java
    M zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
    M zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/limits/RestCallLimiterTest.java
    M zanata-war/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
    M zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
    M zanata-war/src/test/java/org/zanata/notification/ExpiryLetterQueueReceiverTest.java
    M zanata-war/src/test/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandlerTest.java
    M zanata-war/src/test/java/org/zanata/notification/MessageUnwrapperTest.java
    M zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/PoUtilityTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslatorCreditTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    R zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContextsTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    M zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M 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
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/test/QuarantiningRunner.java
    A zanata-war/src/test/java/org/zanata/test/SeamQuarantineTest.java
    R zanata-war/src/test/java/org/zanata/testing/TestTransformer.java
    R zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    R zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    M zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    M zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
    M zanata-war/src/test/java/org/zanata/util/Base64UrlSafeTest.java
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    M zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java
    M zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
    M zanata-war/src/test/java/org/zanata/util/FileUtilTest.java
    M zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java
    M zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
    M zanata-war/src/test/java/org/zanata/util/QueryBuilderTest.java
    M zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.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/SideMenuPresenterTest.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
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.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/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfoTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/DistinctColorListImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/SaveEventQueueTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/SinglePageDataModelImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/rpc/QueryParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicateTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfXSIExtensionValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/TabValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    R zanata-war/src/test/resources/AllIntegrationTests.tng.xml
    R zanata-war/src/test/resources/AllNonContainerTests.tng.xml
    R zanata-war/src/test/resources/AllUnitTests.tng.xml

  Log Message:
  -----------
  Standardise on JUnit; remove TestNG

Squashed commit of the following:

commit d7d801668e3e5e5ec637402f4ec60917ff96b437
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jun 3 12:35:48 2015 +1000

    Create ZanataTest for common annotations

commit 53c496098dcb8e2a6871fc027be9679280f8570e
Merge: 6dcb6a4 3daa552
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jun 2 09:39:29 2015 +1000

    Merge remote-tracking branch 'origin/master' into remove-testng

commit 6dcb6a4a0f75b98184462ed0638f33a291ff8153
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jun 1 18:06:55 2015 +1000

    Remove TestNG assert calls, and TestNG

commit 2c041d9728b3336a15e9df157f864ecbc625c59f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jun 1 17:21:41 2015 +1000

    Convert TestNG tests to JUnit

    - Replace TestNG annotations with JUnit equivalents
    - Ensure @BeforeClass methods are static
    - Add @Test to test methods which were previously covered by a class level
      @Test annotation
    - Convert DataProvider methods to junit-dataprovider, ensure static
    - Isolate tests using org.jboss.seam or SeamAutowire by using
      quarantining-test-runner

commit 6846482c0f6fce18025167a4554bd442da2f98ed
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed May 20 18:07:21 2015 +1000

    Ensure that SeamAutowire loads before tests

commit 3a0b0d11c19733f191821831a062007493af8c39
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue May 19 18:05:42 2015 +1000

    Simplify use of TestNG to aid removal


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java

  Log Message:
  -----------
  Limit user search result: https://bugzilla.redhat.com/show_bug.cgi?id=1227575


  Commit: 0884a60592822fa72c2e1c725e59929fccc28366
      https://github.com/zanata/zanata-server/commit/0884a60592822fa72c2e1c725e59929fccc28366
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Include reindex instruction for HProject


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

  Log Message:
  -----------
  Merge pull request #842 from zanata/rhbz1224030

bind cut and paste event for autocomplete input field


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #843 from zanata/update-release-notes

Include reindex instruction for HProject


  Commit: 475ab903c6af7a324f4be93bb08081ff199327d1
      https://github.com/zanata/zanata-server/commit/475ab903c6af7a324f4be93bb08081ff199327d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M docs/user-guide/translator-guide.md

  Log Message:
  -----------
  Update img to markdown syntax


  Commit: 3d6e0b56b56d03e342edc661227df0a29101c4c6
      https://github.com/zanata/zanata-server/commit/3d6e0b56b56d03e342edc661227df0a29101c4c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

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


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

  Changed paths:
    M docs/user-guide/account/account-activate.md
    M docs/user-guide/account/account-resend-activation.md
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/account/account-sign-up.md
    M docs/user-guide/account/user-dashboard.md
    M docs/user-guide/account/user-profile.md
    M docs/user-guide/admin/admin-overview.md
    M docs/user-guide/admin/contact-admin.md
    M docs/user-guide/admin/manage-search.md
    M docs/user-guide/admin/monitoring.md
    M docs/user-guide/admin/process-manager.md
    M docs/user-guide/admin/role-assignment-rules.md
    M docs/user-guide/admin/server-config.md
    M docs/user-guide/admin/statistic.md
    M docs/user-guide/documents/download-translated-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/documents-view.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    M docs/user-guide/editor/translation-history.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/upload-glossaries.md
    M docs/user-guide/groups/create-group.md
    M docs/user-guide/groups/group-settings.md
    M docs/user-guide/groups/group-view.md
    M docs/user-guide/languages/add-team-member.md
    M docs/user-guide/languages/language-team.md
    M docs/user-guide/languages/modify-role.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/project-view.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/translation-reuse/copy-trans.md
    M docs/user-guide/translation-reuse/copy-version.md
    M docs/user-guide/translation-reuse/merge-trans.md
    M docs/user-guide/translator-guide.md
    M docs/user-guide/versions/create-version.md
    M docs/user-guide/versions/merge-translations.md
    M docs/user-guide/versions/request-to-join-group.md
    M docs/user-guide/versions/version-settings.md
    M docs/user-guide/versions/version-view.md
    M mkdocs.yml

  Log Message:
  -----------
  Remove use_directory_url: false


  Commit: 5578463242d554d4d0a3a88c96efcbb9987dbc69
      https://github.com/zanata/zanata-server/commit/5578463242d554d4d0a3a88c96efcbb9987dbc69
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M docs/user-guide/account/account-activate.md
    M docs/user-guide/account/account-resend-activation.md
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/account/account-sign-up.md
    M docs/user-guide/account/user-dashboard.md
    M docs/user-guide/account/user-profile.md
    M docs/user-guide/admin/admin-overview.md
    M docs/user-guide/admin/contact-admin.md
    M docs/user-guide/admin/manage-search.md
    M docs/user-guide/admin/monitoring.md
    M docs/user-guide/admin/process-manager.md
    M docs/user-guide/admin/role-assignment-rules.md
    M docs/user-guide/admin/server-config.md
    M docs/user-guide/admin/statistic.md
    M docs/user-guide/documents/download-translated-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/documents-view.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    M docs/user-guide/editor/translation-history.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/upload-glossaries.md
    M docs/user-guide/groups/create-group.md
    M docs/user-guide/groups/group-settings.md
    M docs/user-guide/groups/group-view.md
    M docs/user-guide/languages/add-team-member.md
    M docs/user-guide/languages/language-team.md
    M docs/user-guide/languages/modify-role.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/project-view.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/translation-reuse/copy-trans.md
    M docs/user-guide/translation-reuse/copy-version.md
    M docs/user-guide/translation-reuse/merge-trans.md
    M docs/user-guide/translator-guide.md
    M docs/user-guide/versions/create-version.md
    M docs/user-guide/versions/merge-translations.md
    M docs/user-guide/versions/request-to-join-group.md
    M docs/user-guide/versions/version-settings.md
    M docs/user-guide/versions/version-view.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #845 from zanata/updateImageDoc

Update image doc


  Commit: 23d2d36b3c3203ecb424ae61739ed941350f790a
      https://github.com/zanata/zanata-server/commit/23d2d36b3c3203ecb424ae61739ed941350f790a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Redirect to language list page if language is not supported: https://bugzilla.redhat.com/show_bug.cgi?id=1198898


  Commit: 2785a60cdebf2d7021b29ec5e19de9ede536b18b
      https://github.com/zanata/zanata-server/commit/2785a60cdebf2d7021b29ec5e19de9ede536b18b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java

  Log Message:
  -----------
  Merge pull request #844 from zanata/rhbz1227575

Limit user search result


  Commit: 4c43b451103279b4cbc4452a2397d86964f81a32
      https://github.com/zanata/zanata-server/commit/4c43b451103279b4cbc4452a2397d86964f81a32
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  Use embedded JAX-RS, not the container's


  Commit: 8e915d237ee61802d22b6aac9f6da4038cd4cfa6
      https://github.com/zanata/zanata-server/commit/8e915d237ee61802d22b6aac9f6da4038cd4cfa6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #846 from zanata/rhbz1198898-invalid-language

Redirect to language list page if language is not supported


  Commit: 508cdb2a32834ea7c5d701e0a70438db64e81bb1
      https://github.com/zanata/zanata-server/commit/508cdb2a32834ea7c5d701e0a70438db64e81bb1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M pom.xml

  Log Message:
  -----------
  Downgrade Surefire for release


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #848 from zanata/remove-surefire-snapshot

Downgrade Surefire for release


  Commit: 7fc0ecfbf191867ee0636286c55591cfdf600866
      https://github.com/zanata/zanata-server/commit/7fc0ecfbf191867ee0636286c55591cfdf600866
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #847 from zanata/use-embedded-jaxrs

Use embedded JAX-RS, not the container's


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/ZanataTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    A zanata-war/src/test/java/org/zanata/seam/SeamAutowireLinkageTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/test/QuarantiningRunner.java
    R zanata-war/src/test/java/org/zanata/test/SeamQuarantineTest.java

  Log Message:
  -----------
  Start SeamAutowire before tests; remove QuarantiningRunner


  Commit: 12e569d38dc6b1d3ad943229e6bdd4291203b5b8
      https://github.com/zanata/zanata-server/commit/12e569d38dc6b1d3ad943229e6bdd4291203b5b8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  Fix ClassNotFoundException when running on EAP rpm

This fixes java.lang.ClassNotFoundException: 
sun.security.action.GetPropertyAction when loading the projects page,
on JBoss EAP 6.4.0 installed via rpm.


  Commit: b87cfa8da4a8e5f6b218380c383b185de78ef917
      https://github.com/zanata/zanata-server/commit/b87cfa8da4a8e5f6b218380c383b185de78ef917
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Remove unused captcha message: https://bugzilla.redhat.com/show_bug.cgi?id=1116172


  Commit: a6c3f139ada0fdb95e27c329ed7ac3e12bab73e0
      https://github.com/zanata/zanata-server/commit/a6c3f139ada0fdb95e27c329ed7ac3e12bab73e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java

  Log Message:
  -----------
  Remove change of 'Approved' to 'Translated' status in non-require translation review project

Squashed commit of the following:

commit 50292d561c27ff3ca6d6d302430218f3f9ef24c4
Merge: 20c0426 7fc0ecf
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 5 06:39:32 2015 +1000

    Merge branch 'integration/master' into fix-approved-translation

commit 20c04261b09be8079451728709760abaf0d259b6
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 4 12:05:59 2015 +1000

    Remove change of 'Approved' to 'Translated' status in non-require translation review project


  Commit: 94c774372d2557d3c80ac5cd143b2cfd56e60813
      https://github.com/zanata/zanata-server/commit/94c774372d2557d3c80ac5cd143b2cfd56e60813
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Merge pull request #852 from zanata/rhbz1116172

Remove unused captcha message


  Commit: 21bcb87b24c0f1b6fc9782145d8a8fdfb7eca617
      https://github.com/zanata/zanata-server/commit/21bcb87b24c0f1b6fc9782145d8a8fdfb7eca617
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

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

  Log Message:
  -----------
  Disable dodgy test


  Commit: d1cc3cfe5321abab1265fd0d0c1a9b0866710768
      https://github.com/zanata/zanata-server/commit/d1cc3cfe5321abab1265fd0d0c1a9b0866710768
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M docs/index.md
    M docs/release-notes.md
    M docs/user-guide/account/account-activate.md
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/account/user-dashboard.md
    M docs/user-guide/admin/admin-overview.md
    M docs/user-guide/documents/raw-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/documents-view.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/glossary-roles-permissions.md
    M docs/user-guide/glossary/upload-glossaries.md
    M docs/user-guide/groups/group-settings.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/gettext-example.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/project-view.md
    M docs/user-guide/review/add-reviewer.md
    M docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/system-admin/configuration/email.md
    M docs/user-guide/system-admin/configuration/installation.md
    M docs/user-guide/translation-reuse/copy-version.md
    M docs/user-guide/translator-guide.md
    M docs/user-guide/versions/create-version.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml

  Log Message:
  -----------
  Fix broken internal link, update mkdocs.yml deprecated syntax


  Commit: 12580d15d01aced3ace55ad46780b61cb92f5835
      https://github.com/zanata/zanata-server/commit/12580d15d01aced3ace55ad46780b61cb92f5835
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M docs/index.md
    M docs/release-notes.md
    M docs/user-guide/account/account-activate.md
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/account/user-dashboard.md
    M docs/user-guide/admin/admin-overview.md
    M docs/user-guide/documents/raw-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/editor/documents-view.md
    M docs/user-guide/editor/editor-view.md
    M docs/user-guide/editor/overview.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/glossary-roles-permissions.md
    M docs/user-guide/glossary/upload-glossaries.md
    M docs/user-guide/groups/group-settings.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/gettext-example.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/project-view.md
    M docs/user-guide/review/add-reviewer.md
    M docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/system-admin/configuration/email.md
    M docs/user-guide/system-admin/configuration/installation.md
    M docs/user-guide/translation-reuse/copy-version.md
    M docs/user-guide/translator-guide.md
    M docs/user-guide/versions/create-version.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #853 from zanata/updateBrokenLink

Fix broken internal link, update mkdocs.yml deprecated syntax


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

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

  Log Message:
  -----------
  Merge pull request #851 from zanata/fix-rhino-on-eap-rpm

Fix ClassNotFoundException on EAP rpm: rhbz1228086


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/seam/text/SeamTextToCommonMarkParser.java
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    A zanata-war/src/main/java/org/zanata/util/Dependencies.java
    R zanata-war/src/main/resources/META-INF/resources/script/commonmark-0.18.1.min.js
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/test/groovy/org/zanata/MigrateSeamTextToCommonMarkTest.groovy
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java

  Log Message:
  -----------
  Upgrade commonmark.js to 0.19.0; adjust migration

Squashed commit of the following:

commit a0d1df26372cdf9e9aee0cdf8a15fa57c5578fa6
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jun 3 17:02:52 2015 +1000

    Ensure output directory is created

commit 42c4daf4c13c269190fa75f20e028ce714db1fe5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jun 3 16:26:50 2015 +1000

    Work around removal of minification bug

    commonmark-0.18.1.min.js was compressed by jscompress.com (UglifyJS 1),
    which introduced a bug in ampersand handling.  Now that commonmark is no
    longer compressed that way (or at all), the HTML rendering of some text
    has changed.

    The Seam Text to CommonMark converter now handles multiline code blocks
    differently to deal with this, but inline monospace text surrounded by
    pipe ('|') may have minor conversion issues.

commit 03e54adc929e39aaf377b579711198a4e0a7643e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jun 3 09:24:46 2015 +1000

    Improve error message for missing script

commit a44ad08593e4197d196b964890ed62c251973e41
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jun 2 14:04:39 2015 +1000

    Derive versions of webjars from Maven pom

commit 9ad95878e09eafaed2fd0bdd86865eac7e91c8aa
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jun 2 12:00:16 2015 +1000

    Upgrade commonmark.js to 0.19.0

commit cad4e0c73de894833b3b6d227647e9c11935f4fe
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jun 2 11:58:31 2015 +1000

    Get commonmark.js from webjars.org


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/ZanataTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    A zanata-war/src/test/java/org/zanata/seam/SeamAutowireLinkageTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/test/QuarantiningRunner.java
    R zanata-war/src/test/java/org/zanata/test/SeamQuarantineTest.java

  Log Message:
  -----------
  Merge pull request #850 from zanata/remove-quarantine

Start SeamAutowire before tests; remove QuarantiningRunner


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Ignore flaky change password test


  Commit: d929d4cb29f181368133eecba9e1e0c1b27a6faf
      https://github.com/zanata/zanata-server/commit/d929d4cb29f181368133eecba9e1e0c1b27a6faf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M frontend/pom.xml

  Log Message:
  -----------
  download node and npm to user.home/Downloads so a clean build won't download them again


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Merge pull request #855 from zanata/ignore-flaky-password-test

Ignore flaky change password test


  Commit: b90145b3e7802eaffb991d19357b7c96b5c3f812
      https://github.com/zanata/zanata-server/commit/b90145b3e7802eaffb991d19357b7c96b5c3f812
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M frontend/pom.xml

  Log Message:
  -----------
  tell npm to always try install from cache if it has cache younger than configured large value


  Commit: 628ea6ae53f86a16218be101bae453fb772af979
      https://github.com/zanata/zanata-server/commit/628ea6ae53f86a16218be101bae453fb772af979
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    A frontend/README.md

  Log Message:
  -----------
  add readme to frontend module


  Commit: eca53063eaf4335bf77c45605146585ca7c23fe0
      https://github.com/zanata/zanata-server/commit/eca53063eaf4335bf77c45605146585ca7c23fe0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M frontend/README.md
    M frontend/pom.xml

  Log Message:
  -----------
  change default to install from npm registry with profile to activate offline cache mode


  Commit: ce6ab089ba28a5621eabe86ae720890849a436f4
      https://github.com/zanata/zanata-server/commit/ce6ab089ba28a5621eabe86ae720890849a436f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Increase suggested deployment timeout


  Commit: 94b2367eed43b71f5530f272b9454ac1ffb64243
      https://github.com/zanata/zanata-server/commit/94b2367eed43b71f5530f272b9454ac1ffb64243
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M frontend/README.md
    M frontend/pom.xml

  Log Message:
  -----------
  minor naming and readme change


  Commit: 51cda74a0dda42e2f23a0d4b8d79cd1b95bfb885
      https://github.com/zanata/zanata-server/commit/51cda74a0dda42e2f23a0d4b8d79cd1b95bfb885
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  Prevent verbose output in frontend build


  Commit: 6a28b7c382eb8624b88aca18cc6691fda886c822
      https://github.com/zanata/zanata-server/commit/6a28b7c382eb8624b88aca18cc6691fda886c822
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Use generated-resources/deps

This makes it easier to regenerate dependencies.properties after a
rebuild in IntelliJ IDEA, using "Generate Sources and Update Folders..."
button in the Maven Projects tool window.


  Commit: 5d586dbec0834ddad9cb27a6b720812a6ec04c84
      https://github.com/zanata/zanata-server/commit/5d586dbec0834ddad9cb27a6b720812a6ec04c84
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #858 from zanata/generated-resources-deps

Use generated-resources/deps


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  Update 'archived' to 'deleted' in activity table


  Commit: e9d3e575494d779dd75416e03ebe0762213bb87d
      https://github.com/zanata/zanata-server/commit/e9d3e575494d779dd75416e03ebe0762213bb87d
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use zanata-common 3.7.1 (was using old snapshot version that is no longer available)


  Commit: 37b10df56215b1363b48b59f23557ff5ba80a786
      https://github.com/zanata/zanata-server/commit/37b10df56215b1363b48b59f23557ff5ba80a786
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use zanata-api 3.7.2


  Commit: 900e0043392e2c527cff45c75698e02f81d06317
      https://github.com/zanata/zanata-server/commit/900e0043392e2c527cff45c75698e02f81d06317
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

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

  Log Message:
  -----------
  Update to latest parent; fix warnings


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #862 from zanata/update-api-and-common

Update api and common


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Ignore duplicate xml.xsd


  Commit: 4e3f7e67b0a6c392975f46f0d55f3b786630b04d
      https://github.com/zanata/zanata-server/commit/4e3f7e67b0a6c392975f46f0d55f3b786630b04d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1230424-update-archive-to-delete


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

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

  Log Message:
  -----------
  Merge pull request #863 from zanata/parent-24-snapshot

Update to latest parent; fix warnings


  Commit: 73f58678c5d455763f809f9da587b676f5cfb23a
      https://github.com/zanata/zanata-server/commit/73f58678c5d455763f809f9da587b676f5cfb23a
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/JsonDateSerializer.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/Suggestion.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/SuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/TransMemoryUnitSuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java

  Log Message:
  -----------
  Add TM to the Angular editor. Adds a REST endpoint.

Squashed commit of the following:

commit 81f4476e1c4fd321d0c73f6b79851d20b520f649
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 11 10:32:06 2015 +1000

    Remove fallback to stop-words comparison for similarity score calculation.

    This change is contentious, so I am removing it until an amicable resoultion
    to the discussion is reached. Similarity scores need more user testing to
    determine which algorithm will b emost useful to translators.

commit 882e3013b79551c7fcef2cc09b8e65f5e76aa51f
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 11 10:19:01 2015 +1000

    Revert "Change token regex for similarity comparison to pick up more cases."

    This reverts commit db71115b4b8aba64bcc859f010f4cc8675eff3e2.

    More test-cases are required to ensure this regex is correct. Rolling back for
    now so that this change does not go into the next release without thorough
    testing.

    The main problem with the new regex is that it would break on '.' in constructions
    such as URLs, which does not appear to be desired behaviour.

commit 70cbb12a6cb5b51efb17ca558621fff666bd121a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jun 9 13:59:05 2015 +1000

    Update zanata-spa to commit 883b7b9071ef42c5e021c62905d311e985ec8596

commit db71115b4b8aba64bcc859f010f4cc8675eff3e2
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jun 9 13:38:10 2015 +1000

    Change token regex for similarity comparison to pick up more cases.

    The regex was not picking up punctuation that was not followed by whitespace.
    There are still some cases that it is not covering. I have kept this change
    small, and the other changes can be made when there is more time for testing.

commit 276f310a6561d2be8860583b8f0bdcff8b0dbe9d
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jun 9 08:53:54 2015 +1000

    Fall back on stop-words comparison for similarity when nothing else is available.

    A divide-by-zero condition was generating a NaN value for similarity for strings
    that contain only stop-words. When that condition would be met, this will instead
    repeat the comparison without ignoring stop-words, then finally just return 0.0
    if there are still no tokens to compare.

commit 35e0e53e0e9c07e8108663a924800acb3a91bb5b
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jun 9 13:10:30 2015 +1000

    Log more information when TM result row has an unexpected entity type.

    When lucene indexes are in a bad state, search can return a row that
    does not contain one of the expected entity types. This ensures that
    valid rows will still be returned in results, and an error with more
    information will be logged when a bad row is encountered.

commit 0144585604a8ef4b9533dc6ee4c15f46fd391b86
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 4 16:12:07 2015 +1000

    Update zanata-spa to commit 6f20797323e6d45d05eff01cfefb0969f50e5479

commit 990e0ad9e06c4064dfef7bb4d71c44ec04eee904
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 4 13:11:51 2015 +1000

    Update zanata-spa to commit 194a5e237ff5edd47953b89e2e31255de67d0a1d

commit c20e1b77327ab2b0b5cbd85810cc954758588428
Author: David Mason <drdmason at gmail.com>
Date:   Thu May 21 20:58:11 2015 +1000

    Update zanata-spa to commit 402c57d0ebff0ea957f31e4a4e508974b89d9099

commit 68b2b27bfd75d85fcd6cbd419b7b6af965b89037
Author: David Mason <drdmason at gmail.com>
Date:   Thu May 21 15:05:15 2015 +1000

    Add release note for suggestions endpoint.

commit f64358706047919ad2acdec1e3e37ad25ecb0b79
Author: David Mason <drdmason at gmail.com>
Date:   Wed May 20 08:36:50 2015 +1000

    Refactor LocaleServiceImpl.getByLocaleId(String) for brevity.

commit 0a4e2c558576d0db7438d6b7ac4bd2edfb25070a
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 11:34:44 2015 +1000

    Change source and translation locales for suggestions endpoint to query params.

    Since locales can contain non-url-friendly characters, they are better included
    as part of the query string.

commit d98a2fa0a2f03f1c450729258dbff1178c64d568
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 14:59:05 2015 +1000

    Remove unused media type string for suggestions.

    Changed to use the JSON media type for suggestions.

commit 36bf6b771000b16fa3da26b89541bec8fb20c4e7
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 14:23:32 2015 +1000

    Use Option instead of Either in SuggestionService

commit 7d65aeacab4c8638d1d4368f87a1b475355790bd
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 14:22:43 2015 +1000

    Add @Nullable annotation to locale lookup.

commit 03068168eec7d8bb94265d2633e4e3cd3416fb6c
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 11:01:23 2015 +1000

    Prevent undeclared IllegalArgumentException when looking up locales.

commit 68a25b8b81085009fb430456217edd37d39e4d7e
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 10:37:10 2015 +1000

    Make search type lookup case-insensitive.

    The try block could be removed because iterating enum values will not
    give nulls, and equalsIgnoreCase will behave sensibly with an entered
    null value.

commit 0b8e828fa773afd9ba25fba5986984cb77f1e4cb
Author: David Mason <drdmason at gmail.com>
Date:   Tue May 19 10:24:11 2015 +1000

    Keep format strings in the same scope as String.format()

    Format strings were being passed to a function, which seems confusing
    and so more error-prone. Changed to passing an already-formatted string
    so that the format strings can be inlined in the call to String.format()
    so that it is obvious that they are format strings and what the
    placeholders represent.

commit 727c0a08108950976a38600f9e5a4e443b070164
Author: David Mason <drdmason at gmail.com>
Date:   Sat May 9 22:09:39 2015 +1000

    Add REST endpoint for suggestions for editor.

commit 3b8addd059cdf0587283c20064913d0622471486
Author: David Mason <drdmason at gmail.com>
Date:   Fri May 15 21:34:36 2015 +1000

    Add method to get suggestions from TM service.

    I have avoided changing the existing code paths for TM search for now
    since it is a performance-critical component for translation copy. We
    should combine the code paths in a separate operation as long as it
    does not impact on performance.

commit bee070e731f99b45248f5fbc15b4fc6af9c3a717
Author: David Mason <drdmason at gmail.com>
Date:   Fri May 15 22:34:51 2015 +1000

    Add DTOs for suggestions and suggestion detail.

    These DTO classes are only configured to serialize to JSON, and I have
    not considered deserialization since this is query data and not expected
    to be uploaded to the server.

commit a53c3cc85f312fcbdfb7c1bb411ae4b3330ad1b6
Author: David Mason <drdmason at gmail.com>
Date:   Wed May 13 08:58:52 2015 +1000

    Workaround TM result coalescing bug.

    Refactors the match processing code to make it clearer what type of
    match is being added to a result item, and makes a few small changes
    to minimize the incorrect behaviour:

     - No longer adds imported TM item id to the list that is used to look
       up text flows.
      A more complete fix is to wrap the Long id in a type so that
     all the ids are present and can be used sensibly. This just
     makes the list appropriate for the code that uses it right
     now, to delay spending the development time for the full fix.

     - Upgrades match type when a match has a higher match type, where
       ApprovedInternal > TranslatedInternal > Imported.
      Imported is treated as lowest just because the editor suppresses
     details display for Imported. Treating the others as higher will
     allow users to see text flow details for the other types.
      The full fix for this would be to inculde a summary of all the
     match types in the DTO, so the editor can display whatever
     makes sense.


  Commit: c30800a09c36b63dcbf25cf1652d544dacf29034
      https://github.com/zanata/zanata-server/commit/c30800a09c36b63dcbf25cf1652d544dacf29034
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  Merge pull request #857 from zanata/quiet-frontend-build

Prevent verbose output in frontend build


  Commit: 3e3ca4a896cd3c61b2e4ca460475eb9705dc5171
      https://github.com/zanata/zanata-server/commit/3e3ca4a896cd3c61b2e4ca460475eb9705dc5171
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  Merge pull request #860 from zanata/rhbz1230424-update-archive-to-delete

Update 'archived' to 'deleted' in activity table


  Commit: 0682460404a44efa37ecb81acf68c2fe3875f222
      https://github.com/zanata/zanata-server/commit/0682460404a44efa37ecb81acf68c2fe3875f222
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java

  Log Message:
  -----------
  Update activity table with deleted version/project

https://bugzilla.redhat.com/show_bug.cgi?id=1229940

Squashed commit of the following:

commit 3b75c6abf8badd559409d724c938aeb44e0a00a3
Merge: bb373bd 3e3ca4a
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 12 12:39:24 2015 +1000

    Merge branch 'integration/master' into rhbz1229940-update-activity

commit bb373bd7183e782bdd5b66524b7370cb9261519c
Merge: f3a3c68 d9c20f2
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 12 06:35:19 2015 +1000

    Merge branch 'integration/master' into rhbz1229940-update-activity

commit f3a3c68f40ab1add0074145767164fbe5fe7ec62
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 11 13:04:50 2015 +1000

    Update activity table with deleted version/project: https://bugzilla.redhat.com/show_bug.cgi?id=1229940


  Commit: 4a222ec2f16cf0d5ec98124aab94b4c03d01aa46
      https://github.com/zanata/zanata-server/commit/4a222ec2f16cf0d5ec98124aab94b4c03d01aa46
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Only show "approved" figure in version page if "Review required" is enable or value more than 0

https://bugzilla.redhat.com/show_bug.cgi?id=1230419

Squashed commit of the following:

commit 96550d0dc054a8781aecbb947e04c48e813279b9
Merge: b2e3510 0682460
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 12 13:10:53 2015 +1000

    Merge branch 'integration/master' into hide-approved-stats-in-version

commit b2e35103a310e38329e51a39fa3a223ac7c6f27a
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jun 10 11:41:11 2015 +1000

    hide approved figure if its zero in version page


  Commit: 34954ffcba90bec83eacd02eacdd38009201e620
      https://github.com/zanata/zanata-server/commit/34954ffcba90bec83eacd02eacdd38009201e620
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    A frontend/README.md
    M frontend/pom.xml

  Log Message:
  -----------
  Merge pull request #856 from zanata/frontend

Make frontend module more offline friendly


  Commit: 8e296f7dea88f785b8ae5938af3847c1218ee6f0
      https://github.com/zanata/zanata-server/commit/8e296f7dea88f785b8ae5938af3847c1218ee6f0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Fetch updated translations from translate.zanata.org


Compare: https://github.com/zanata/zanata-server/compare/665863460456...8e296f7dea88


More information about the zanata-commits mailing list