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

GitHub noreply at github.com
Tue Apr 26 05:30:47 UTC 2016


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


  Commit: 33401680d8b7e1f99fabf1586b7aa9311c8294bc
      https://github.com/zanata/zanata-server/commit/33401680d8b7e1f99fabf1586b7aa9311c8294bc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  fix webpack version to the one works before and configure it to fail the build if something wrong with it


  Commit: a0175636ad183058f21d4ec7cec4b7b83bd6f76f
      https://github.com/zanata/zanata-server/commit/a0175636ad183058f21d4ec7cec4b7b83bd6f76f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/pom.xml
    M functional-test/pom.xml
    M pom.xml
    M zanata-liquibase/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: b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
      https://github.com/zanata/zanata-server/commit/b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

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

  Log Message:
  -----------
  disable google merge account


  Commit: 85fd8d688975183affdea3731f21560d9bde121f
      https://github.com/zanata/zanata-server/commit/85fd8d688975183affdea3731f21560d9bde121f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Reuse surefire forks


  Commit: 43f22cf7a2bcde7ac9a1d6c96e1cbdd483b2a420
      https://github.com/zanata/zanata-server/commit/43f22cf7a2bcde7ac9a1d6c96e1cbdd483b2a420
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  Merge pull request #868 from zanata/fix-build

fix webpack version to the one works before


  Commit: 160802835ab485773f86689a6c447c385a6ec5cb
      https://github.com/zanata/zanata-server/commit/160802835ab485773f86689a6c447c385a6ec5cb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #869 from zanata/reuse-surefire-forks

Reuse surefire forks


  Commit: 403c454079c3ac3c2b2944aab80984388e56b3e2
      https://github.com/zanata/zanata-server/commit/403c454079c3ac3c2b2944aab80984388e56b3e2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/reuse-surefire-forks' into release


  Commit: 92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
      https://github.com/zanata/zanata-server/commit/92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'release' into disable-google-merge-account


  Commit: 0fcf95eff10190c05648cace4ce3aa974b048c7a
      https://github.com/zanata/zanata-server/commit/0fcf95eff10190c05648cace4ce3aa974b048c7a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

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

  Log Message:
  -----------
  Avoid generating duplicate Executions


  Commit: a9eefcc21b54f6315482b16f7befea7267e63fd9
      https://github.com/zanata/zanata-server/commit/a9eefcc21b54f6315482b16f7befea7267e63fd9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update to wildfly 9.0.0.CR2


  Commit: ffa5bb130f260e822059304f097f5b78ccf4587d
      https://github.com/zanata/zanata-server/commit/ffa5bb130f260e822059304f097f5b78ccf4587d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java

  Log Message:
  -----------
  Ensure consistent ordering across JVMs

This was breaking JavaVariablesValidationTest on OpenJDK 1.8 JVMs.


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

  Changed paths:
    M frontend/pom.xml
    A frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    M frontend/src/main/web/user-profile-page/package.json

  Log Message:
  -----------
  shrinkwrap npm modules and fix webpack build problem


  Commit: 5c0549da634aab1a8225926e7342d45a84b7c2d0
      https://github.com/zanata/zanata-server/commit/5c0549da634aab1a8225926e7342d45a84b7c2d0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/etc/dependencyVersions.groovy

  Log Message:
  -----------
  Move dependencyVersions.groovy to a file


  Commit: 70d9ef2ba04c305488e83edbaa6af4ee410e1347
      https://github.com/zanata/zanata-server/commit/70d9ef2ba04c305488e83edbaa6af4ee410e1347
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #870 from zanata/disable-google-merge-account

disable google merge account


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

  Changed paths:
    M frontend/README.md

  Log Message:
  -----------
  modify readme on shrinkwrap information


  Commit: 64a34a0951c8aa76a18395ebc3eb1827a2f8f8a3
      https://github.com/zanata/zanata-server/commit/64a34a0951c8aa76a18395ebc3eb1827a2f8f8a3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #873 from zanata/wildfly-9.0.0.CR2

Update to wildfly 9.0.0.CR2


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

  Changed paths:
    M frontend/pom.xml
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  change to the way webpack expected to work


  Commit: b55beb86af40dfb9f8941b3949747694c3183d9e
      https://github.com/zanata/zanata-server/commit/b55beb86af40dfb9f8941b3949747694c3183d9e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    A etc/scripts/extractAppserver.groovy
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Use Groovy script to install appserver

This should make it easier to switch between EAP and WildFly for
testing.  Assuming you have set `EAP6_URL`, and you're happy to use
the version of WildFly specified in the pom, you just switch between
`-Dappserver=jbosseap6` and `-Dappserver=wildfly8`.

No need to specify any of these (and it's easier to switch if you don't):
- cargo.installation
- cargo.basename
- appserver.dir.name

You can still specify these if you want to change the version of WildFly
itself or the version of the management api::
- wildfly.version
- wildfly.client.version


  Commit: 632592034822342cdcaf13a277f762ea6ff910ad
      https://github.com/zanata/zanata-server/commit/632592034822342cdcaf13a277f762ea6ff910ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    A etc/scripts/extractAppserver.groovy
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/dependencyVersions.groovy

  Log Message:
  -----------
  Merge pull request #864 from zanata/simplify-appserver-properties

Simplify appserver properties


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

  Changed paths:
    M frontend/README.md
    M frontend/pom.xml
    A frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js

  Log Message:
  -----------
  Merge pull request #875 from zanata/shrinkwrap-npm

shrinkwrap npm modules and fix webpack build problem


  Commit: 8a50c5785f901823e28f62ab1a287ab5d5ceb0ca
      https://github.com/zanata/zanata-server/commit/8a50c5785f901823e28f62ab1a287ab5d5ceb0ca
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map

  Log Message:
  -----------
  Update zanata-spa to commit c6095814a088c87442347b0b5a1f64cca7e4e53d

Squashed commit of the following:

commit 6745942d4ba14b7f82bbf2397355eeb30048a97e
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 15 10:38:37 2015 +1000

    Update zanata-spa to commit c6095814a088c87442347b0b5a1f64cca7e4e53d

commit 3d7cd4f99ef66a829926eef815b12b76b20e3a59
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 12 12:13:29 2015 +1000

    Update zanata-spa to commit 7d6c54600db4d8b747f8a919b1aa2fd89b1f6824

    Changes:

     - Add 100% height to editor wrapper so background is 100% in firefox
     - Fix dropdown/transunit overflow problems
     - Applying difference properties to the right elements… again.


  Commit: fd7018b6d8e2630c6b7f47b07861ebf3ed02d61e
      https://github.com/zanata/zanata-server/commit/fd7018b6d8e2630c6b7f47b07861ebf3ed02d61e
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map

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

Bring across some fixes from release branch that should also be applied
to master branch.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java

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

Fix tests on JVM 1.8; reduce executions


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java

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


  Commit: 527634b55f0c497e0b01b4f8b1610ad5c1c3ca98
      https://github.com/zanata/zanata-server/commit/527634b55f0c497e0b01b4f8b1610ad5c1c3ca98
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    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/main/webapp/resources/script/commonmark-preview.js
    M zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  Disable CommonMark preview


  Commit: 35fb9f083047e8ac3b4270910fd05463c56f13d8
      https://github.com/zanata/zanata-server/commit/35fb9f083047e8ac3b4270910fd05463c56f13d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    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/main/webapp/resources/script/commonmark-preview.js

  Log Message:
  -----------
  Enable CommonMark preview with Caja Sanitizer


  Commit: 5aa95de3bc5e64a8ef9607c20f559ff5dfa319d1
      https://github.com/zanata/zanata-server/commit/5aa95de3bc5e64a8ef9607c20f559ff5dfa319d1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to latest client release


  Commit: 513990025cf7aa0fa3438e719558d7077c046bd0
      https://github.com/zanata/zanata-server/commit/513990025cf7aa0fa3438e719558d7077c046bd0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: Update zanata-client version to 3.7.0


  Commit: b817e151a6fabd5174ce9706214b14c5dd1e1258
      https://github.com/zanata/zanata-server/commit/b817e151a6fabd5174ce9706214b14c5dd1e1258
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: Update zanata-client version to 3.7.0


  Commit: 73f9283b4c5bdc9447993649e27e07ce83bb8c75
      https://github.com/zanata/zanata-server/commit/73f9283b4c5bdc9447993649e27e07ce83bb8c75
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    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/main/webapp/resources/script/commonmark-preview.js
    M zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  Merge pull request #876 from zanata/disable-commonmark-preview

Disable CommonMark preview


  Commit: 2ff4212f0b01812bc034937e8a6094fd4d3a446e
      https://github.com/zanata/zanata-server/commit/2ff4212f0b01812bc034937e8a6094fd4d3a446e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Fix null exception in more activity load: https://bugzilla.redhat.com/show_bug.cgi?id=1231054


  Commit: 10c90f9928b1b1bee3da49662f80bbfbbb5deb5b
      https://github.com/zanata/zanata-server/commit/10c90f9928b1b1bee3da49662f80bbfbbb5deb5b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    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/main/webapp/resources/script/commonmark-preview.js
    M zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java

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


  Commit: 699af9e97f6edc290e91f7e8979b4f9f7602220a
      https://github.com/zanata/zanata-server/commit/699af9e97f6edc290e91f7e8979b4f9f7602220a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

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

  Log Message:
  -----------
  Update zanata-maven-plugin version to zanta-client-version


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

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

  Log Message:
  -----------
  Allow admin to access inactive language page


  Commit: fbc9f805ee308b095bc14b7338de3ed168754148
      https://github.com/zanata/zanata-server/commit/fbc9f805ee308b095bc14b7338de3ed168754148
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Added bug 1203521 to 3.7


  Commit: 0691dda2ac4633aff5509c7e33ae86de2983c572
      https://github.com/zanata/zanata-server/commit/0691dda2ac4633aff5509c7e33ae86de2983c572
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #883 from zanata/zanata-maven-plugin-3.7.0

Update zanata-maven-plugin version to zanta-client-version


  Commit: 4941fe281b33a9bd3686325b162b9d510eab4dd7
      https://github.com/zanata/zanata-server/commit/4941fe281b33a9bd3686325b162b9d510eab4dd7
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    M zanata-war/pom.xml

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


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Merge pull request #880 from zanata/rhbz1231054-more-activity-exception

Fix null exception in more activity load


  Commit: 5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
      https://github.com/zanata/zanata-server/commit/5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

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


  Commit: 472925f55bd2bb0b48dedcee5faacaac2c9968e4
      https://github.com/zanata/zanata-server/commit/472925f55bd2bb0b48dedcee5faacaac2c9968e4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #884 from zanata/fix-disabled-lang-for-admin

Allow admin to access inactive language page


  Commit: 32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
      https://github.com/zanata/zanata-server/commit/32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  rhbz1234687,ZANATA-8 fix error uploading pot file from web UI


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

  Changed paths:
    M docs/release-notes.md

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


  Commit: 360e1ada78a9a708371748795a2c3712ec17f001
      https://github.com/zanata/zanata-server/commit/360e1ada78a9a708371748795a2c3712ec17f001
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

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


  Commit: 1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
      https://github.com/zanata/zanata-server/commit/1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  Merge pull request #881 from zanata/zanata8-ui-upload-pot

ZANATA-8 fix error uploading pot file from web UI


  Commit: 4726e0ee4a890323f606d8cb088f093a239198a5
      https://github.com/zanata/zanata-server/commit/4726e0ee4a890323f606d8cb088f093a239198a5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  rhbz1234687,ZANATA-8 fix error uploading pot file from web UI


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

  Changed paths:
    M docs/release-notes.md

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


  Commit: 51c118273701d3ce2091a26027b9eef5ef49e27c
      https://github.com/zanata/zanata-server/commit/51c118273701d3ce2091a26027b9eef5ef49e27c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Update report issue link


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

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

  Log Message:
  -----------
  Merge pull request #885 from zanata/update-issue-link

Update report issue link


  Commit: 13c6e48e600d79798fd2be9a3d9eb9bfc42270dd
      https://github.com/zanata/zanata-server/commit/13c6e48e600d79798fd2be9a3d9eb9bfc42270dd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

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


  Commit: 51b5dddbff45680dbf9c08e8de8fa7cc27879c65
      https://github.com/zanata/zanata-server/commit/51b5dddbff45680dbf9c08e8de8fa7cc27879c65
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M docs/user-guide/client/client.md

  Log Message:
  -----------
  Fix broken zanata-client link in docs


  Commit: 92b62a64d63fb5091c2836983132841822504bc2
      https://github.com/zanata/zanata-server/commit/92b62a64d63fb5091c2836983132841822504bc2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M docs/user-guide/client/client.md

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


  Commit: 3b316decad6a06c58aa31827df69405fe3e1ff8d
      https://github.com/zanata/zanata-server/commit/3b316decad6a06c58aa31827df69405fe3e1ff8d
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: update version of parent, assets, and client


  Commit: 29c4b0c3d8bc78fa7c3357cab14cf7af70d13147
      https://github.com/zanata/zanata-server/commit/29c4b0c3d8bc78fa7c3357cab14cf7af70d13147
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI


  Commit: b0459f99664e74822695942013f688ec1d8924e5
      https://github.com/zanata/zanata-server/commit/b0459f99664e74822695942013f688ec1d8924e5
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: parent is now 25-SNAPSHOT


  Commit: 9988b4bc627918adad12598111ab580868dbe604
      https://github.com/zanata/zanata-server/commit/9988b4bc627918adad12598111ab580868dbe604
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  Merge pull request #887 from zanata/rhbz1235495-po-upload-fix

rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI


  Commit: 4c7934ba5779aff781278f33620ae5a304a77e90
      https://github.com/zanata/zanata-server/commit/4c7934ba5779aff781278f33620ae5a304a77e90
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI


  Commit: 766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
      https://github.com/zanata/zanata-server/commit/766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/rest/ZanataJacksonJsonProvider.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/AbstractResource.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/EntityHomeWrapper.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyContextInjectionInterceptor.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyProviderFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyResourceFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/package-info.java
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/resources/META-INF/seam-deployment.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_tr.properties
    A zanata-war/src/main/resources/org/zanata/seam/resteasy/resteasy-2.3.xsd
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    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/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/test/java/org/zanata/MockResourceFactory.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.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

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

commit 71d284ba8f988efaf6f15f6ceb86b18fcb562bd4
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 16:42:49 2015 +1000

    minor change

commit 5e952150d6c358aca438fa274c35c62933c05936
Merge: 772525a b817e15
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:55:21 2015 +1000

    Merge branch 'integration/master' into resteasy3

    Conflicts:
    	zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    	zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    	zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java

commit 772525afbbfc13d199f2fc204184d29d8d49dfaa
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:49:01 2015 +1000

    use jboss module instead of packaging the jar (javax.inject-api)

commit 11e8fca4df8ba81eab500251d3ec22ef6b78abe9
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 11:59:46 2015 +1000

    fix functional test

commit 1c34b8beee15681af8f0bd0e3679a83b983c9975
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 14:15:11 2015 +1000

    fix all static analysis error and added enforcer rule for stax-api conflict

commit 459b17f7be51c1ae46ff96f58e8784728ebbb076
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:54:03 2015 +1000

    fix duplicate class finder error

commit 9c0b497bba438f52125146cea35c0b92c3927136
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:08:52 2015 +1000

    fix dependency check

commit 20f4ce8b7eaf8d29045117675694be024aa9562a
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 11:36:11 2015 +1000

    override built-in RESTEasy Jackson provider to NOT use JAXB annotation

commit 5a15bcca4324e03c4a8e9e9a8607cc8a08e74c7d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jun 16 15:01:46 2015 +1000

    fix integration test

commit f1a74e9950335af483ac4ae54bdd0e5198004601
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jun 11 11:48:47 2015 +1000

    Fix a failing test.

commit efabd4e03c445d5b5a72ead88c2a5e1248cf9b83
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Jun 5 11:03:50 2015 +1000

    Fixes for Resteasy3

    Disble Java EE modules from EAP/Wildfly
    Enable Providers via Seam2
    Adjust Arquillian packaging.

commit 2b08324f1a978c513315be5518e2aee08b911af9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 14:51:58 2015 +1000

    Make enforcer happy

commit f1e89355ca30510a169c2403bc557404d099bdcd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 13:08:31 2015 +1000

    Upgrade to RESTEasy 3


  Commit: ce5ecafa77e360d1e5d119e53d4b45406f2d5f18
      https://github.com/zanata/zanata-server/commit/ce5ecafa77e360d1e5d119e53d4b45406f2d5f18
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

  Log Message:
  -----------
  Add 'required' for email field in account create page


  Commit: 90ce6529a27d5c02edd136b1397c4c4a23e4d54c
      https://github.com/zanata/zanata-server/commit/90ce6529a27d5c02edd136b1397c4c4a23e4d54c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

  Log Message:
  -----------
  Add 'required' for email field in account create page


  Commit: 158ad02d0883b0dc522974afd02fe1100b9cc5b2
      https://github.com/zanata/zanata-server/commit/158ad02d0883b0dc522974afd02fe1100b9cc5b2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/search/SearchPage.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    R zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Update search page:

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

Squashed commit of the following:

commit a315251f4fceba4d89e7a8e330e7785b014ca6de
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 16:33:33 2015 +1000

    Fix functional test

commit 5c0653240cb74c05d5ea9a535e64c2e9633282d6
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 13:28:18 2015 +1000

    Update release notes

commit 739f262151bd8179bf738986440c70840409849d
Merge: 67a6e84 766cfc0
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 13:25:01 2015 +1000

    Merge branch 'integration/master' into update-search

commit 67a6e842dfd23927ed481b414037bc2559b4a74e
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 22 13:14:56 2015 +1000

    fix functional test

commit 3d51cf3d33f86d9e8fdba880ca1684f6643c94f7
Merge: 1d168cf e15076e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 19 11:09:55 2015 +1000

    Merge branch 'integration/master' into update-search

commit 1d168cf905427a3f7c73271d7d2ce2107ac47b1d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 9 16:06:24 2015 +1000

    update search screen


  Commit: 2506bac717169ac36bb9dde8c0a6ab1c07e1401e
      https://github.com/zanata/zanata-server/commit/2506bac717169ac36bb9dde8c0a6ab1c07e1401e
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.7.0-alpha-1


  Commit: 45f7f76d9d156a98f32889b7fe87f4f10985cb0f
      https://github.com/zanata/zanata-server/commit/45f7f76d9d156a98f32889b7fe87f4f10985cb0f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

  Log Message:
  -----------
  Revert "[maven-release-plugin] prepare release server-3.7.0-alpha-1"

This reverts commit 2506bac717169ac36bb9dde8c0a6ab1c07e1401e.


  Commit: 7019c02baf1c2d87b0983e11583925ca767ab7a2
      https://github.com/zanata/zanata-server/commit/7019c02baf1c2d87b0983e11583925ca767ab7a2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.7.0-alpha-2


  Commit: ee8e5a77a5f869ea9032e830c1d9479df5510e82
      https://github.com/zanata/zanata-server/commit/ee8e5a77a5f869ea9032e830c1d9479df5510e82
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

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

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


  Commit: 0045c5de89c9c964437db1bd7164df0af766cd4a
      https://github.com/zanata/zanata-server/commit/0045c5de89c9c964437db1bd7164df0af766cd4a
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

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

  Log Message:
  -----------
  Add explicit dependency on jms.

This was causing a deployment failure on JBoss EAP 6.3.3 with a root cause of

  java.lang.ClassNotFoundException: javax.jms.MessageListener
    from [Module "deployment.zanata.war:main" from Service Module Loader]

Related: https://issues.jboss.org/browse/WFLY-4642


  Commit: 2c60e1c1f771c362d04d8819080d5e7c75f146dd
      https://github.com/zanata/zanata-server/commit/2c60e1c1f771c362d04d8819080d5e7c75f146dd
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #890 from zanata/add-explicit-jms-dependency

Add explicit dependency on jms.


  Commit: b5775c51d5c5071beacc01331b0f0c2081d25d9d
      https://github.com/zanata/zanata-server/commit/b5775c51d5c5071beacc01331b0f0c2081d25d9d
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml

  Log Message:
  -----------
  refactor(jsf): move project translation settings to separate files

To reduce project settings template to a more maintainable size.


  Commit: e0d4415b9c486eddd7e2cd3ab5703088fd3db6fe
      https://github.com/zanata/zanata-server/commit/e0d4415b9c486eddd7e2cd3ab5703088fd3db6fe
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  refactor(jsf): move project general settings to separate file

To reduce project settings template to a more maintainable size.


  Commit: 52482bda4ac7f56ff56b0bea6e7e143aee55e2c9
      https://github.com/zanata/zanata-server/commit/52482bda4ac7f56ff56b0bea6e7e143aee55e2c9
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update version of api, common, client


  Commit: 70e87501e4b0bdbc8c03be446e384184dfa61285
      https://github.com/zanata/zanata-server/commit/70e87501e4b0bdbc8c03be446e384184dfa61285
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    A zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.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/ActivityServiceImpl.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
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.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
    R zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    A zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/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/server/rpc/GetTranslationHistoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.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/MergeTranslationsServiceImplTest.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
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.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/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Add metadata of how translation is being input:

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

Squashed commit of the following:

commit 4af776a092935490089944e8ea84a66316303c8b
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 2 12:02:17 2015 +1000

    fix unit test

commit 289ea093666888121d212a70dec320683d0157d0
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 2 08:43:26 2015 +1000

    Set entity properties for HTextFlowTargetHistory when copy version

commit 618c5e057fd46749ed0bf61713f7b53809764207
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 1 13:11:58 2015 +1000

    Set automatedEntry when update in HTextFlowTarget

commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 30 08:13:13 2015 +1000

    Add javadoc for new type

commit d493b441e61a74954ba9bab19e2c7168979d42ba
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 29 11:07:07 2015 +1000

    Update release notes

commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
Merge: 0eb64ff 158ad02
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 29 11:06:26 2015 +1000

    Merge branch 'integration/master' into rhbz1235070-stats

commit 0eb64ff68323140c333388d6606ecba071e07272
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 29 10:55:39 2015 +1000

    Merge MessageGenerator with TranslationUtil

commit f74a132f551edac954f7d0a660fe79ee54ecd598
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 16:03:59 2015 +1000

    Add automatedEntry condition for user statistic query

commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 13:24:15 2015 +1000

    Add revision comment in editor history

commit bd98cc73c36adf836d98b90615e368ad231d0463
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 25 16:27:22 2015 +1000

    Add sourceType for all translation update

commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 25 15:12:32 2015 +1000

    Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory

commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 25 11:40:25 2015 +1000

    Add revision comment from TM Merge action


  Commit: 1db182a00fd25d42b2b615dfee2375cf230ff07b
      https://github.com/zanata/zanata-server/commit/1db182a00fd25d42b2b615dfee2375cf230ff07b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

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

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


  Commit: cba32610876bb4445c4fb6d5c1175a3b6df8c25c
      https://github.com/zanata/zanata-server/commit/cba32610876bb4445c4fb6d5c1175a3b6df8c25c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

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

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


  Commit: 2c1c7ab78c7047dd5b566a86a379d45619f29276
      https://github.com/zanata/zanata-server/commit/2c1c7ab78c7047dd5b566a86a379d45619f29276
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: Update to latest snapshot


  Commit: 266a7dcbdfc374270181ffc80416126e78d3934e
      https://github.com/zanata/zanata-server/commit/266a7dcbdfc374270181ffc80416126e78d3934e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Add CORS to response


  Commit: 46f7b2212a43a7989628d88d3b74bcd204f3e034
      https://github.com/zanata/zanata-server/commit/46f7b2212a43a7989628d88d3b74bcd204f3e034
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Merge pull request #892 from zanata/CORS

CORS Support


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java

  Log Message:
  -----------
  Fix WebDriver for Firefox.
Squashed commit of the following:

commit 8d7dc26f43a46507784a7a54b502fb886d9a9901
Author: Damian Jansen <djansen at redhat.com>
Date:   Mon May 18 22:25:19 2015 +1000

    Clean up WebDriverFactory

commit dc1ea7cf38cb0dabf634ce2a0ca76ca42b6b0ea3
Author: Damian Jansen <djansen at redhat.com>
Date:   Mon May 18 14:50:48 2015 +1000

    Fix cannot cast FirefoxDriver to EventFiringWebDriver error


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    M zanata-war/src/main/java/org/zanata/util/QueryBuilder.java

  Log Message:
  -----------
  Implement exclude option for user search in lastmodified by field

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

Squashed commit of the following:

commit eff63659f4f4bf8126eecc533cb40e117396e03d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 09:54:43 2015 +1000

    Implement 'not exist' query for FilterConstraintToQuery

commit c6691116ee14c54ef449ca0c87056852b8f18798
Merge: 7ce3e91 46f7b22
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 08:08:54 2015 +1000

    Merge branch 'integration/master' into rhbz1224912-exclude-user-filter

commit 7ce3e91b08ccdf2fad45747dbb545d2170915b19
Merge: 68eb551 158ad02
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 29 11:04:51 2015 +1000

    Merge branch 'integration/master' into rhbz1224912-exclude-user-filter

commit 68eb55194e2d50eb35d05b89a73a544bd9cd1e9e
Merge: 2881fa8 10c90f9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 22 14:00:04 2015 +1000

    Merge branch 'integration/master' into rhbz1224912-exclude-user-filter

commit 2881fa85aee753d57f27c45be9f1060c5d4dd309
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jun 11 16:04:10 2015 +1000

    Handle exclude username in filtering


  Commit: 6eae81e77a63c9427eb00a90a41e0891ffb88b28
      https://github.com/zanata/zanata-server/commit/6eae81e77a63c9427eb00a90a41e0891ffb88b28
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Get wildfly zip from JBoss Maven repository

Wildfly 10 alphas are in Maven, but currently not
http://wildfly.org/downloads/


  Commit: 96fe0b9c718287558405cd1e1c5fc63304b57cab
      https://github.com/zanata/zanata-server/commit/96fe0b9c718287558405cd1e1c5fc63304b57cab
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HDocument.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/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.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/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.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/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    A zanata-war/src/main/java/org/zanata/security/CheckLoggedInProvider.java
    A zanata-war/src/main/java/org/zanata/security/CheckPermissionDecisionVoter.java
    A zanata-war/src/main/java/org/zanata/security/CheckRoleDecisionVoter.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    A zanata-war/src/main/java/org/zanata/security/annotations/CheckLoggedIn.java
    A zanata-war/src/main/java/org/zanata/security/annotations/CheckPermission.java
    A zanata-war/src/main/java/org/zanata/security/annotations/CheckRole.java
    A zanata-war/src/main/java/org/zanata/security/annotations/PermissionTarget.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/HttpParams.java
    A zanata-war/src/main/java/org/zanata/servlet/annotations/HttpParam.java

  Log Message:
  -----------
  Prepare for CDI (mostly security-related)

Squashed commit of the following:

commit 0e1bc3bae2251dc50073afdd48598364e4f7d853
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jul 1 12:01:58 2015 +1000

    Avoid injection of generic type

commit 355e0cf4b8207421f32b133c4f1ed011e8411b03
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jul 1 11:06:18 2015 +1000

    Replace @Restrict(hasPermission) with identity.checkPermission

commit 40bb26304d928e7772ed291fb88abaaf685362a5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jun 26 14:31:05 2015 +1000

    Add @HttpParam from Weld manual

commit 3830ee581c6e57fd89089ad32e9a738ad001f400
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jun 26 14:27:34 2015 +1000

    Specify param names for injection

commit b26c94656f7e774d81c4103b031ddc5185b7ec1d
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jun 26 14:14:16 2015 +1000

    Add new security annotations for CDI

commit 2a304fab002244d7fda8cf6feaf5551ce64402ec
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jun 26 14:12:03 2015 +1000

    Remove explicit use of ScopeType

commit 7968cdfa3d71f7baae517f9b80bf3db62cdddd7e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jun 26 14:10:43 2015 +1000

    Use EntityRestrict alone instead of Restrict

commit 13a6a073f58ccac61542dfdc52072152b4546688
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jun 23 14:50:07 2015 +1000

    Mark TranslationMemoryServiceImpl as @Alternative

commit a9112f4bf0b7e9f56530a4ab66e7f15e5170d95f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jun 22 16:57:15 2015 +1000

    Add dependencies for CDI; fix CDI version


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueSender.java
    A zanata-war/src/main/java/org/zanata/notification/InVMJMS.java
    A zanata-war/src/main/java/org/zanata/notification/JmsResourcesProducer.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java

  Log Message:
  -----------
  Prepare JMS resources for CDI; fix autocomplete component

- all autocomplete instances are anonymous inner classes and should NOT
  reference any outer (entity home) instance injected field (Seam will
  remove them)

- security check should be performed (identity.checkPermission) inside
  this autocomplete instance before making change to the entity

- add functional test to test "add version group language" (another
  autocomplete case that is not covered yet)


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Capitalised proper nouns in project type description: https://bugzilla.redhat.com/show_bug.cgi?id=1002386


  Commit: 8d03bfcef25a6d7065b264c6e8b9fab1af3cfab4
      https://github.com/zanata/zanata-server/commit/8d03bfcef25a6d7065b264c6e8b9fab1af3cfab4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Bump WildFly to 9.0.0.Final


  Commit: ae2237ab299044f73f3363ee90723e6e35bcebbe
      https://github.com/zanata/zanata-server/commit/ae2237ab299044f73f3363ee90723e6e35bcebbe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/etc/dependencyVersions.groovy

  Log Message:
  -----------
  Move dependencyVersions.groovy to a file


  Commit: 2e9aba517e6556d7df5bf2ceb9aa8ad5b5cbf3af
      https://github.com/zanata/zanata-server/commit/2e9aba517e6556d7df5bf2ceb9aa8ad5b5cbf3af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    A etc/scripts/extractAppserver.groovy
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Use Groovy script to install appserver

This should make it easier to switch between EAP and WildFly for
testing.  Assuming you have set `EAP6_URL`, and you're happy to use
the version of WildFly specified in the pom, you just switch between
`-Dappserver=jbosseap6` and `-Dappserver=wildfly8`.

No need to specify any of these (and it's easier to switch if you don't):
- cargo.installation
- cargo.basename
- appserver.dir.name

You can still specify these if you want to change the version of WildFly
itself or the version of the management api::
- wildfly.version
- wildfly.client.version


  Commit: 243ef953b72cd1579017948b56032fa0ed8e4797
      https://github.com/zanata/zanata-server/commit/243ef953b72cd1579017948b56032fa0ed8e4797
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #897 from zanata/rhbz1002386

Capitalised proper nouns in project type description


  Commit: 31690ee7793529c0593912ffefd747ea4741eddb
      https://github.com/zanata/zanata-server/commit/31690ee7793529c0593912ffefd747ea4741eddb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Update editor color


  Commit: 6f5fa763226ed58dc1b68106820003997fc4ed9b
      https://github.com/zanata/zanata-server/commit/6f5fa763226ed58dc1b68106820003997fc4ed9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Disable tm import button if no file selected

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

Squashed commit of the following:

commit 21ea07e880c2d97b91af665fa58746252b6e188e
Merge: 3cd7f88 243ef95
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 15:27:21 2015 +1000

    Merge branch 'integration/master' into rhbz1004620

commit 3cd7f8864ba87aa2c41986696a8a438675f79745
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 14:32:24 2015 +1000

    Disable tm import button if no file selected: https://bugzilla.redhat.com/show_bug.cgi?id=1004620


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

  Changed paths:
    M docs/index.md

  Log Message:
  -----------
  Fix typo in URL


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

  Changed paths:
    M docs/index.md

  Log Message:
  -----------
  Fix typo in URL


  Commit: b17037281b555fec989d469893ce63b6a9332fa7
      https://github.com/zanata/zanata-server/commit/b17037281b555fec989d469893ce63b6a9332fa7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

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

  Log Message:
  -----------
  Update functional test for TM import dialog


  Commit: ccf4139a3fa4a3ee2534a14f0a9224a41066b31e
      https://github.com/zanata/zanata-server/commit/ccf4139a3fa4a3ee2534a14f0a9224a41066b31e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Add CORS to response


  Commit: ec3b5fa4903db1f6e98a8241bdd728a3c157007e
      https://github.com/zanata/zanata-server/commit/ec3b5fa4903db1f6e98a8241bdd728a3c157007e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Merge pull request #896 from zanata/update-editor-color

Update editor color


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    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/main/webapp/resources/script/commonmark-preview.js

  Log Message:
  -----------
  Merge pull request #877 from zanata/reenable-commonmark-preview

Re-enable commonmark preview


  Commit: 45ddbb6492a85d63ea04c0bdfdfe1912ca154cec
      https://github.com/zanata/zanata-server/commit/45ddbb6492a85d63ea04c0bdfdfe1912ca154cec
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Revert "Add CORS to response"

This reverts commit ccf4139a3fa4a3ee2534a14f0a9224a41066b31e.


  Commit: 17cf90d599a801c3393910eb6bed45aa309dca89
      https://github.com/zanata/zanata-server/commit/17cf90d599a801c3393910eb6bed45aa309dca89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

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

  Log Message:
  -----------
  Upgrade to commonmark.js 0.20


  Commit: 7e90a9b74ecb888710e67bbd0a87d4058e00699a
      https://github.com/zanata/zanata-server/commit/7e90a9b74ecb888710e67bbd0a87d4058e00699a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java

  Log Message:
  -----------
  feat: role: New permission for create project

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

Squashed commit of the following:

commit 3e8da24ecd73683fd1cc8713d1e80cf2c61fcc07
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 12:34:53 2015 +1000

    Refactor create role method

commit e9fde4cd5fe19fa35c37ff7f9da1b406b8fd4ce2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 08:36:41 2015 +1000

    Update security comment

commit 3005d2d657636de4044d1099a41c3e0a1ae5d2bd
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 08:11:18 2015 +1000

    New permission for create project: https://bugzilla.redhat.com/show_bug.cgi?id=1214502


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

  Changed paths:
    M docs/user-guide/system-admin/configuration/authentication.md
    M docs/user-guide/system-admin/configuration/installation.md

  Log Message:
  -----------
  Update platform requirements and mention Bouncy Castle

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


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

  Changed paths:
    M docs/user-guide/system-admin/configuration/authentication.md
    M docs/user-guide/system-admin/configuration/installation.md

  Log Message:
  -----------
  Update platform requirements and mention Bouncy Castle

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


  Commit: 7d9dda0593a8389eb0a85fd189bf100fe7fc3c48
      https://github.com/zanata/zanata-server/commit/7d9dda0593a8389eb0a85fd189bf100fe7fc3c48
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #878 from zanata/commonmarkjs-0.20

Upgrade to commonmark.js 0.20


  Commit: b2d7ea504ae8acee9fcbc87c5b528417e5e76aa1
      https://github.com/zanata/zanata-server/commit/b2d7ea504ae8acee9fcbc87c5b528417e5e76aa1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    A zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.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/ActivityServiceImpl.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
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.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
    R zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    A zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/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/server/rpc/GetTranslationHistoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    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
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.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/MergeTranslationsServiceImplTest.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
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.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/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  feat(statistic): Exclude copied translation from user stats

https://github.com/zanata/zanata-server/pull/900
https://bugzilla.redhat.com/show_bug.cgi?id=1235070

Squashed commit of the following:

commit 56de5bcfa5bd2e0e0a2fccfe9f4a080a675c3d8c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 12:54:07 2015 +1000

    Fix indentation format

commit c9942efed283e8ac0c3c82cbaebc7732ae886ac5
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 20:59:49 2015 +1000

    Merge entityType with TranslationEntityType

commit db993dd410f4fa447088f1e434f769291c9050c3
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 16:06:27 2015 +1000

    Merge db-changelog 3.8 to 3.7

commit 8f4031047a5ae931d43a3279b3b38dc04699d1c1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 2 15:58:13 2015 +1000

    Add metadata of how translation is being input:

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

    Squashed commit of the following:

    commit 4af776a092935490089944e8ea84a66316303c8b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 12:02:17 2015 +1000
   fix unit test

    commit 289ea093666888121d212a70dec320683d0157d0
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 08:43:26 2015 +1000
   Set entity properties for HTextFlowTargetHistory when copy version

    commit 618c5e057fd46749ed0bf61713f7b53809764207
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 1 13:11:58 2015 +1000
   Set automatedEntry when update in HTextFlowTarget

    commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jun 30 08:13:13 2015 +1000
   Add javadoc for new type

    commit d493b441e61a74954ba9bab19e2c7168979d42ba
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:07:07 2015 +1000
   Update release notes

    commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
    Merge: 0eb64ff 158ad02
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:06:26 2015 +1000
   Merge branch 'integration/master' into rhbz1235070-stats

    commit 0eb64ff68323140c333388d6606ecba071e07272
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 10:55:39 2015 +1000
   Merge MessageGenerator with TranslationUtil

    commit f74a132f551edac954f7d0a660fe79ee54ecd598
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 16:03:59 2015 +1000
   Add automatedEntry condition for user statistic query

    commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 13:24:15 2015 +1000
   Add revision comment in editor history

    commit bd98cc73c36adf836d98b90615e368ad231d0463
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 16:27:22 2015 +1000
   Add sourceType for all translation update

    commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 15:12:32 2015 +1000
   Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory

    commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 11:40:25 2015 +1000
   Add revision comment from TM Merge action


  Commit: fd950955676d356e838fc2b654997a4c4386e622
      https://github.com/zanata/zanata-server/commit/fd950955676d356e838fc2b654997a4c4386e622
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
    M zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/util/TranslationUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    R zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    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
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java

  Log Message:
  -----------
  feat(statistic): Exclude copied translation from user stats

https://github.com/zanata/zanata-server/pull/900
https://bugzilla.redhat.com/show_bug.cgi?id=1235070

Squashed commit of the following:

commit 56de5bcfa5bd2e0e0a2fccfe9f4a080a675c3d8c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 12:54:07 2015 +1000

    Fix indentation format

commit c9942efed283e8ac0c3c82cbaebc7732ae886ac5
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 20:59:49 2015 +1000

    Merge entityType with TranslationEntityType

commit db993dd410f4fa447088f1e434f769291c9050c3
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 16:06:27 2015 +1000

    Merge db-changelog 3.8 to 3.7

commit 8f4031047a5ae931d43a3279b3b38dc04699d1c1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 2 15:58:13 2015 +1000

    Add metadata of how translation is being input:

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

    Squashed commit of the following:

    commit 4af776a092935490089944e8ea84a66316303c8b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 12:02:17 2015 +1000
   fix unit test

    commit 289ea093666888121d212a70dec320683d0157d0
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 08:43:26 2015 +1000
   Set entity properties for HTextFlowTargetHistory when copy version

    commit 618c5e057fd46749ed0bf61713f7b53809764207
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 1 13:11:58 2015 +1000
   Set automatedEntry when update in HTextFlowTarget

    commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jun 30 08:13:13 2015 +1000
   Add javadoc for new type

    commit d493b441e61a74954ba9bab19e2c7168979d42ba
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:07:07 2015 +1000
   Update release notes

    commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
    Merge: 0eb64ff 158ad02
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:06:26 2015 +1000
   Merge branch 'integration/master' into rhbz1235070-stats

    commit 0eb64ff68323140c333388d6606ecba071e07272
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 10:55:39 2015 +1000
   Merge MessageGenerator with TranslationUtil

    commit f74a132f551edac954f7d0a660fe79ee54ecd598
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 16:03:59 2015 +1000
   Add automatedEntry condition for user statistic query

    commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 13:24:15 2015 +1000
   Add revision comment in editor history

    commit bd98cc73c36adf836d98b90615e368ad231d0463
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 16:27:22 2015 +1000
   Add sourceType for all translation update

    commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 15:12:32 2015 +1000
   Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory

    commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 11:40:25 2015 +1000
   Add revision comment from TM Merge action


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Fix ProfileTest generate api key test and increase email check timeout

It appears that there was a race condition with the alert disappearing
and the number of expected background functions.
Also add more logging.


  Commit: 109370185c634f0a15efd99e777ba03848f54829
      https://github.com/zanata/zanata-server/commit/109370185c634f0a15efd99e777ba03848f54829
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Merge pull request #906 from zanata/fix-profile-api-key-test

Fix ProfileTest generate api key test


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Fix ProfileTest generate api key test and increase email check timeout

It appears that there was a race condition with the alert disappearing
and the number of expected background functions.
Also add more logging.


  Commit: 07e73704480a4940008ba76feb5e5dededf6b12d
      https://github.com/zanata/zanata-server/commit/07e73704480a4940008ba76feb5e5dededf6b12d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  fix(copy version): refresh version entry in UI after copy version


  Commit: 225326db4337abedcca29cf02714cf4870456ee6
      https://github.com/zanata/zanata-server/commit/225326db4337abedcca29cf02714cf4870456ee6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Ignore poorly executing API key test


  Commit: 6b1aecd2e34c7b90ff985a8c8cd4793f13cfa2b3
      https://github.com/zanata/zanata-server/commit/6b1aecd2e34c7b90ff985a8c8cd4793f13cfa2b3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  Merge pull request #907 from zanata/rhbz1242679

fix(copy version): refresh version entry in UI after copy version


  Commit: 241bc408ab1c6e4d800b395d9fc17ac9bed4efdf
      https://github.com/zanata/zanata-server/commit/241bc408ab1c6e4d800b395d9fc17ac9bed4efdf
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Merge pull request #909 from zanata/ignore-broken-apikey-test

Ignore poorly executing API key test


  Commit: 4a83049132c104a2d4a593c19c273a1d72fefcaf
      https://github.com/zanata/zanata-server/commit/4a83049132c104a2d4a593c19c273a1d72fefcaf
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

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

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


  Commit: ea0932d47ac51cef67653d90b1cc8a9d116d7a09
      https://github.com/zanata/zanata-server/commit/ea0932d47ac51cef67653d90b1cc8a9d116d7a09
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

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

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


  Commit: 2e7845a1005cbeef80e7bcf5c9f86087725fe5a4
      https://github.com/zanata/zanata-server/commit/2e7845a1005cbeef80e7bcf5c9f86087725fe5a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml

  Log Message:
  -----------
  fix(gwt): avoid packaging .junit_symbolMaps/

This should reduce the size of zanata.war, and probably speed up builds
a bit too.


  Commit: 71536705e9ebe64ef5f938fb6857ceaf14bfeff0
      https://github.com/zanata/zanata-server/commit/71536705e9ebe64ef5f938fb6857ceaf14bfeff0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  feat(pom): build zanata.rpm (with -Drpm)


  Commit: dfa42ada5fb4d928f9352c8065b104dcc41c63e2
      https://github.com/zanata/zanata-server/commit/dfa42ada5fb4d928f9352c8065b104dcc41c63e2
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Mark 3.7.0 as non-public release


  Commit: 2bae087ffed71fd6a177d73a275875025fff1f35
      https://github.com/zanata/zanata-server/commit/2bae087ffed71fd6a177d73a275875025fff1f35
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Mark 3.7.0 as non-public release


  Commit: c089c4e34743c67fe551b985e4005f5e61924e5f
      https://github.com/zanata/zanata-server/commit/c089c4e34743c67fe551b985e4005f5e61924e5f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-16 (Thu, 16 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java

  Log Message:
  -----------
  fix(search): Fix sort in Zanata search page

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


  Commit: bd33f08c933c8572725d0d8f131cd654aaee5b50
      https://github.com/zanata/zanata-server/commit/bd33f08c933c8572725d0d8f131cd654aaee5b50
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-16 (Thu, 16 Jul 2015)

  Changed paths:
    R docs/images/project-webhooks-settings-2.png
    M docs/images/project-webhooks-settings.png
    M docs/release-notes.md
    M docs/user-guide/projects/project-settings.md
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    R zanata-war/src/main/java/org/zanata/events/JSONType.java
    A zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    A zanata-war/src/main/java/org/zanata/util/HmacUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.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/project/settings-tab.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/WebhookPublisherCallback.java
    A zanata-war/src/test/java/org/zanata/service/impl/WebhooksPublisherITCase.java
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    A zanata-war/src/test/java/org/zanata/util/HmacUtilTest.java

  Log Message:
  -----------
  feat(webhook): include signed header for webhook response

https://bugzilla.redhat.com/show_bug.cgi?id=1213630
https://github.com/zanata/zanata-server/pull/904

Squashed commit of the following:

commit 872def0462046cd57d30dc6c895271f18b647263
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 16 11:50:15 2015 +1000

    Add pseudocode in doc for verify webhook request

commit 52366c98ca6e423cafad8d363d751fce4442b1a9
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 16 11:16:56 2015 +1000

    Update doc with double hash information

commit f7f851a5a761208ae2fc229a8ce478567ca28cef
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 15 13:41:09 2015 +1000

    Fix null and empty secret key for webhook

commit 78f20f5246862c09513c7946c8d0fcb9cb519b4d
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 15 06:46:22 2015 +1000

    Update documentation

commit fbb4ef5476dcd6549ed91b7cd28001689008b7d4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 14 16:36:27 2015 +1000

    Fix functional test

commit a98ee2dddd677532c9ba15c21ba2b6d22a8ce57a
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 14 13:13:41 2015 +1000

    Move secret to each webhook url

commit beb37070b098f1b19a8f8e2708566eaab6c26a2e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 14 10:58:39 2015 +1000

    rename server url to callbackURL, add unit test for signHeader

commit 2c125857e2cdff7221e37350ad881eb8bdd9cda6
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 13 13:35:26 2015 +1000

    Fix enforcer issue with package dependency

commit e184c8f39201b488ac286ba50b42cfb46b4852c0
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 13 12:35:13 2015 +1000

    Rename test to integration test, update webhook field to be secret field

commit 16e14b137ab8c0ac5be128b9dc3ce34f6268ac4d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 13 10:27:37 2015 +1000

    Exlude banned dependency

commit 7a421d74c9a34d632d5fc1ae958356d5123bdd8f
Author: Alex Eng <aeng at redhat.com>
Date:   Sat Jul 11 17:04:40 2015 +1000

    Update docs, update test and rename webhookKey to webhookSecret

commit 92f1e0f2873eaeae6f5e00d80476f5403ae8e976
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 10 16:18:53 2015 +1000

    Update button loader

commit 8a091c277b4d6fa1c1ca2f24f8331f0a7a700f84
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 10 15:35:12 2015 +1000

    feat(webhook): add zanata header for webhook

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

commit 434ce8429824b59be93392a1d3e8081003c9e87f
Merge: d6e68c5 fd95095
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 10 08:25:17 2015 +1000

    Merge branch 'integration/master' into rhbz1213630-webhook

commit d6e68c5bbe00db0a21549877202ad9beb3a6f80e
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 16:08:58 2015 +1000

    Add hmacsha1 header if secret key avaiQlable

commit d4780c136b8eb153565d1195375688c61c5b066a
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 14:17:02 2015 +1000

    Add document url into webhook post data

commit 2144c4f2de690d726d80e5ce42d8fe65828410fc
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 10:50:36 2015 +1000

    Add secret key for webhook in HProject


  Commit: 07800cd011bf80d7454ff02ebeeadd57f9de2e63
      https://github.com/zanata/zanata-server/commit/07800cd011bf80d7454ff02ebeeadd57f9de2e63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java

  Log Message:
  -----------
  Merge pull request #913 from zanata/rhbz1243251-sort-in-search

fix(search): Fix sort in Zanata search page


  Commit: a3f66058e3c4525342488a7ea6f0e7ae16c1353e
      https://github.com/zanata/zanata-server/commit/a3f66058e3c4525342488a7ea6f0e7ae16c1353e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  fix,test(Functional test): fix broken functional test


  Commit: f5a5207a379d7b5348d1c95203b6446205851732
      https://github.com/zanata/zanata-server/commit/f5a5207a379d7b5348d1c95203b6446205851732
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

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

fix,test(Functional test): fix broken functional test


  Commit: c31ffda6b364d2c97641d52852facffdcc69adf2
      https://github.com/zanata/zanata-server/commit/c31ffda6b364d2c97641d52852facffdcc69adf2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml

  Log Message:
  -----------
  fix,style(glossary upload): update glossary upload dialog

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

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

Squashed commit of the following:

commit d085bcaf18782be3fa4993e66e7a5aef4e0cccdf
Merge: 2126b89 07800cd
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 17 10:59:14 2015 +1000

    Merge branch 'integration/master' into rhbz1062476-glossary-upload

commit 2126b899933abb25e62540c87241c6ec8c0c634b
Merge: 2dd4216 bd33f08
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 17 09:39:24 2015 +1000

    Merge branch 'integration/master' into rhbz1062476-glossary-upload

commit 2dd421698afe2be1ed643386509504bb7cefe9df
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 16 14:24:30 2015 +1000

    fix,style(glossary upload): update glossary upload dialog


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #911 from zanata/rpm-maven-plugin

feat(pom): build zanata.rpm (with -Drpm)


  Commit: 46ab129a0f665cc7aac39986b838f2c9b628aa76
      https://github.com/zanata/zanata-server/commit/46ab129a0f665cc7aac39986b838f2c9b628aa76
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  feat(editor): display flags and reference from pot file

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

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

Squashed commit of the following:

commit ca229612b847f97bebb555ab702ccce2caade59d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 20 13:43:22 2015 +1000

    Hide last modified by if no data

commit 17f90837c30f8f52b494c22041b22a94e9e474e8
Merge: 430a7e3 c31ffda
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 20 09:49:49 2015 +1000

    Merge branch 'integration/master' into rhbz1243672-source-refs

commit 430a7e3f9fc88eb6c576759bd52c37974f8c4593
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 17 15:02:25 2015 +1000

    feat(editor): display flags and reference from pot file

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


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

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

  Log Message:
  -----------
  fix(search): rhbz1244612 close EntityManagerFactory at shutdown


  Commit: b4b816e61f9c32a31b67fbdca38fff7a21336d23
      https://github.com/zanata/zanata-server/commit/b4b816e61f9c32a31b67fbdca38fff7a21336d23
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/test/java/org/zanata/service/impl/WebhookPublisherCallback.java
    R zanata-war/src/test/java/org/zanata/service/impl/WebhooksPublisherITCase.java
    A zanata-war/src/test/java/org/zanata/service/impl/WebhooksPublisherTest.java

  Log Message:
  -----------
  fix(webhook test): update webhook unit test

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


  Commit: 79e3ee6c8c93461c1dc54649bbc0093390d5a5b1
      https://github.com/zanata/zanata-server/commit/79e3ee6c8c93461c1dc54649bbc0093390d5a5b1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java

  Log Message:
  -----------
  fix(group): fix group filtering

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

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


  Commit: c4db129fc3652cafd66f924b3ab3553d80e02f43
      https://github.com/zanata/zanata-server/commit/c4db129fc3652cafd66f924b3ab3553d80e02f43
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-21 (Tue, 21 Jul 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/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java

  Log Message:
  -----------
  fix(pot upload): Fix pot file upload via UI ignore comment

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

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

Squashed commit of the following:

commit 6650e5349900be9c2f38d1fb5bb519ea6a555131
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 21 11:24:02 2015 +1000

    Clear details header after translation update

commit 43cbdec288057d9aafcef0171be829cd998b37c5
Merge: ac7bb68 79e3ee6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 21 10:35:22 2015 +1000

    Merge branch 'integration/master' into rhbz1243682-pot-comment

commit ac7bb68d47c163a47bad75951203f0d5aa87f254
Merge: c841afa 46ab129
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 20 16:08:09 2015 +1000

    Merge branch 'integration/master' into rhbz1243682-pot-comment

commit c841afa4eae5c4738dd8bd8f22dd195fa13003a9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jul 20 13:35:22 2015 +1000

    Add comment when uploading pot via UI


  Commit: 48afc3763949abf578dcf65206cd78d9009f3bd2
      https://github.com/zanata/zanata-server/commit/48afc3763949abf578dcf65206cd78d9009f3bd2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-22 (Wed, 22 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #893 from zanata/wildfly-9.0.0.Final

Bump WildFly to 9.0.0.Final


  Commit: 94a91ee06888382821bebb3965a77383cf2db2d9
      https://github.com/zanata/zanata-server/commit/94a91ee06888382821bebb3965a77383cf2db2d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-22 (Wed, 22 Jul 2015)

  Changed paths:
    A etc/scripts/extractAppserver.groovy
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/dependencyVersions.groovy

  Log Message:
  -----------
  Merge pull request #898 from zanata/backport-simplify-appserver-properties

Backport "Simplify appserver properties"


  Commit: ab5cccc1fe10df3c629c278d0df23dd014deeb93
      https://github.com/zanata/zanata-server/commit/ab5cccc1fe10df3c629c278d0df23dd014deeb93
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M docs/user-guide/projects/project-settings.md
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  fix(create-project): update docs and add permission check for create project button in dashboard


  Commit: 64c99545341b6a4d1afdf5296d8e5db9f75ed298
      https://github.com/zanata/zanata-server/commit/64c99545341b6a4d1afdf5296d8e5db9f75ed298
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M docs/user-guide/projects/project-settings.md
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  Merge pull request #921 from zanata/update-doc

fix(create-project): update docs, add permission check for create project


  Commit: 324efbf107cdb3e809a223fc5e723dc373beb561
      https://github.com/zanata/zanata-server/commit/324efbf107cdb3e809a223fc5e723dc373beb561
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml

  Log Message:
  -----------
  Merge pull request #910 from zanata/remove-junit-symbolmaps

fix(gwt): avoid packaging .junit_symbolMaps/


  Commit: 5d86956f6aded14e10556d6c1da0aac953ced605
      https://github.com/zanata/zanata-server/commit/5d86956f6aded14e10556d6c1da0aac953ced605
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseInsensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java

  Log Message:
  -----------
  refactor(search): remove obsolete classes


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

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

  Log Message:
  -----------
  refactor(TM): tidy up query code a little


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

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/Analyzers.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/UnigramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java

  Log Message:
  -----------
  feat(search): add analyzers for Lucene tools like Luke


  Commit: 95145166e0cae40af5e3de1f1b74ff01a0cbf524
      https://github.com/zanata/zanata-server/commit/95145166e0cae40af5e3de1f1b74ff01a0cbf524
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/SlowTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.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/DocumentServiceImplTest.java

  Log Message:
  -----------
  Ignore slow tests


  Commit: 076513fd3db6a1ec36e379ec584dec92c3b1895d
      https://github.com/zanata/zanata-server/commit/076513fd3db6a1ec36e379ec584dec92c3b1895d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

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

  Log Message:
  -----------
  Unignore a test


  Commit: 0306e6b681973c8d03a2e263343844aa8bb80fbd
      https://github.com/zanata/zanata-server/commit/0306e6b681973c8d03a2e263343844aa8bb80fbd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #874 from zanata/wildfly-10.0.0.x

Get wildfly zip from JBoss Maven repository


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  feat(TM): add sysprop for max TM results, more logging


  Commit: 33ed7d96afb9b9fc352dc8d0d59b99dcc7d7bc93
      https://github.com/zanata/zanata-server/commit/33ed7d96afb9b9fc352dc8d0d59b99dcc7d7bc93
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

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

  Log Message:
  -----------
  feat(TM): pre-sort TM results by TextFlowTarget timestamp


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

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

  Log Message:
  -----------
  chore: bump recommended EAP/WildFly versions


  Commit: 698924146afa025b6db97b717cb764b1b9f87240
      https://github.com/zanata/zanata-server/commit/698924146afa025b6db97b717cb764b1b9f87240
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    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_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_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_TW_Hant.properties

  Log Message:
  -----------
  Fetch updated translations from translate.zanata.org


  Commit: 3f76a66ee2cd692dfb3c3a6d0e4a9e72554952cf
      https://github.com/zanata/zanata-server/commit/3f76a66ee2cd692dfb3c3a6d0e4a9e72554952cf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

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

  Log Message:
  -----------
  fix(activity): Update activity query to improve performance


  Commit: bdf889bba4498925dd54e94e16f5ab32016d6442
      https://github.com/zanata/zanata-server/commit/bdf889bba4498925dd54e94e16f5ab32016d6442
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/Analyzers.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseInsensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/UnigramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  Merge pull request #923 from zanata/improve-tm-results

Improve TM results


  Commit: 03482e9a2d62121850ff88527a823b593bde8731
      https://github.com/zanata/zanata-server/commit/03482e9a2d62121850ff88527a823b593bde8731
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseInsensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java

  Log Message:
  -----------
  refactor(search): remove obsolete classes


  Commit: c6fc6f59d22d6da22aca3976948cab098778f49a
      https://github.com/zanata/zanata-server/commit/c6fc6f59d22d6da22aca3976948cab098778f49a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

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

  Log Message:
  -----------
  refactor(TM): tidy up query code a little


  Commit: 731e283a3915906be251dd66269c0d635bb9945c
      https://github.com/zanata/zanata-server/commit/731e283a3915906be251dd66269c0d635bb9945c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/Analyzers.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/UnigramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java

  Log Message:
  -----------
  feat(search): add analyzers for Lucene tools like Luke


  Commit: 7a501bdb5fbd6f1b02c8a9ab8242f9135d3a8fdd
      https://github.com/zanata/zanata-server/commit/7a501bdb5fbd6f1b02c8a9ab8242f9135d3a8fdd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  feat(TM): add sysprop for max TM results, more logging


  Commit: bda2738ea8b7e9c33d9823a368df812c09d073a0
      https://github.com/zanata/zanata-server/commit/bda2738ea8b7e9c33d9823a368df812c09d073a0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

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

  Log Message:
  -----------
  feat(TM): pre-sort TM results by TextFlowTarget timestamp


  Commit: 9a0ab602c39aeef43992ef378b535ccfe6a554fc
      https://github.com/zanata/zanata-server/commit/9a0ab602c39aeef43992ef378b535ccfe6a554fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/Analyzers.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseInsensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    R zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/UnigramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  Merge pull request #927 from zanata/improve-tm-results

Improve TM results


  Commit: 11dff7cdcd6da919770527e7b4af2201bca74969
      https://github.com/zanata/zanata-server/commit/11dff7cdcd6da919770527e7b4af2201bca74969
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  feat(TM): allow TM search by TextFlowTarget metadata


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

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

  Log Message:
  -----------
  Merge pull request #925 from zanata/wildfly901

chore: bump recommended EAP/WildFly versions


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

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

  Log Message:
  -----------
  Merge pull request #920 from zanata/rhbz1244612-emf-close

fix(search): rhbz1244612 close EntityManagerFactory at shutdown


  Commit: 7b640b3d6f401477ed91eb97088e0d5cbf157bbc
      https://github.com/zanata/zanata-server/commit/7b640b3d6f401477ed91eb97088e0d5cbf157bbc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #926 from zanata/fix-activity-query

fix(activity): Update activity query to improve performance


  Commit: 9d0387e55e5d21439555d5f18c44cb9326175541
      https://github.com/zanata/zanata-server/commit/9d0387e55e5d21439555d5f18c44cb9326175541
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-08-10 (Mon, 10 Aug 2015)

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/system-admin/configuration/authentication.md
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.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/src/main/java/org/zanata/annotation/EntityRestrict.java
    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/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    R zanata-model/src/main/java/org/zanata/model/type/UserApiKey.java
    A zanata-model/src/main/java/org/zanata/security/EntityAction.java
    A zanata-model/src/main/java/org/zanata/security/Identity.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-9/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.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/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.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/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.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/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.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/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    A zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    A zanata-war/src/main/java/org/zanata/action/RoleSearch.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
    A zanata-war/src/main/java/org/zanata/action/UserSearch.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/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/events/AlreadyLoggedInEvent.java
    A zanata-war/src/main/java/org/zanata/events/LoginFailedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LoginSuccessfulEvent.java
    A zanata-war/src/main/java/org/zanata/events/NotLoggedInEvent.java
    A zanata-war/src/main/java/org/zanata/events/PostAuthenticateEvent.java
    A zanata-war/src/main/java/org/zanata/events/UserCreatedEvent.java
    A zanata-war/src/main/java/org/zanata/exception/AuthorizationException.java
    A zanata-war/src/main/java/org/zanata/exception/IdentityManagementException.java
    A zanata-war/src/main/java/org/zanata/exception/NoSuchRoleException.java
    A zanata-war/src/main/java/org/zanata/exception/NoSuchUserException.java
    A zanata-war/src/main/java/org/zanata/exception/NotLoggedInException.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/NotLoggedInExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.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/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    A zanata-war/src/main/java/org/zanata/seam/interceptor/ZanataSecurityInterceptor.java
    A zanata-war/src/main/java/org/zanata/seam/security/AbstractRunAsOperation.java
    A zanata-war/src/main/java/org/zanata/seam/security/IdentityManager.java
    A zanata-war/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/CheckPermissionDecisionVoter.java
    M zanata-war/src/main/java/org/zanata/security/FacesSecurityEvents.java
    R zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    A zanata-war/src/main/java/org/zanata/security/Role.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    A zanata-war/src/main/java/org/zanata/security/SimpleGroup.java
    A zanata-war/src/main/java/org/zanata/security/SimplePrincipal.java
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    R zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/security/annotations/CheckPermission.java
    A zanata-war/src/main/java/org/zanata/security/annotations/ZanataSecured.java
    A zanata-war/src/main/java/org/zanata/security/jaas/InternalLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/PasswordUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.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/AddReviewCommentHandler.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/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.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/usermanager.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.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/LocaleMemberDAOITCase.java
    M zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    A zanata-war/src/test/java/org/zanata/security/SecurityAnnotationTest.java
    A zanata-war/src/test/java/org/zanata/security/ZanataIdentityTest.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/TranslationServiceImplJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.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/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    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/testProp.properties

  Log Message:
  -----------
  refactor(security): Squashed commit of replacing seam security:

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

commit 61eedf1a3b8f32420291700f841c31fe0d7a3b0c
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Aug 7 16:02:15 2015 +1000

    fix normal user can not create version bug

commit 22c012cbe3fdcd20f43c449d0d3836fe290fa0f2
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Aug 5 14:47:04 2015 +1000

    rename classes

commit 9d8a2231eb8568ea6bcb3745f4fbb451aff5a008
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Aug 5 14:46:42 2015 +1000

    update documentation

commit 49d586e9ffde13db013a15dd2c688fd014216c5d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Aug 4 16:29:23 2015 +1000

    add comment and use identityManager instead of identityStore

commit 60a527d0ac717188c23491b400e9b87ee5eba7fa
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Aug 4 10:29:58 2015 +1000

    add comment

commit 619c49da85834f5e8c950369eda577bb70338d5d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 20:44:52 2015 +1000

    fix tests

commit 46eecc4fe31a1b4cc2ca4bbf2bc3365f2c853b80
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 18:10:38 2015 +1000

    added release note

commit a48bcd7ee0762a996cf822e644e515911d52626c
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 18:04:26 2015 +1000

    refactor and add more test

commit ac5c32b2f040535319843d7210365b0dd8c7a181
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 10:35:00 2015 +1000

    add test for ZanataIdentity

commit 0b63b768643590e9a80dea2a529a66434d5d1591
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 10:34:48 2015 +1000

    refactor according to review

commit 416c91f324ff26ac52e19b778f336e7faae36feb
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 31 10:12:51 2015 +1000

    delete unused RememberMe class

commit 8c15931afd14437c7a5da6c20fbc7e055a57fb88
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 30 16:16:55 2015 +1000

    fix dependencies and static check error

commit 1f14203fbd6a2bb45dbd0ac0a6db138cf6108cba
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 30 14:39:18 2015 +1000

    remove all seam security dependencies

commit 217bced4ea134c4498fd07f9b6ca3860c0ded31b
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 30 14:38:46 2015 +1000

    delete UserApiKey since we don't have to rely on reflection

commit 6beac7f61dcac307a3de4c59daec572c195e7579
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 30 11:17:54 2015 +1000

    test security annotations are correctly set

commit 2e991399aeaf5314bcb86e14ff992a44cb5a201b
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 30 09:25:41 2015 +1000

    move package

commit 3a05064047c371da8c47bf99a531eae57a9d1ca7
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jul 29 14:52:41 2015 +1000

    fix checkstyle

commit 78b264be3b8196e6df22725e763f63a796866dbf
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 28 15:10:07 2015 +1000

    replace seam security exceptions

commit 36f3c8c1bf157353c79b8a9e2a46b42427d0530f
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 28 12:28:14 2015 +1000

    replace seam Pricipal,Role,Group implementation

commit a1bdd7020339411d23f9ed6a963677a8295b1f41
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 28 11:06:05 2015 +1000

    remove dependency on seam permissionMapper

commit 0887de50f75d6d0208794d4dcbc4cc89bd8d25e4
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 28 10:53:37 2015 +1000

    clean up

commit b6f5493faea4940844fb92df0a1b9aa7a6192e8a
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Jul 27 11:47:58 2015 +1000

    replace seam events with in-house events

commit a4653a145d34c0f141609a6aa6eed860a62fb1e1
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Jul 27 10:40:02 2015 +1000

    un-extend seam's JpaIdentityStore

commit 706f5a16928e563a9219e0cf4d9fde84436ba007
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 23 16:18:17 2015 +1000

    javadoc and minor refactoring

commit 45f44252d88c836ceca41a74154fb38a958c51ad
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 23 16:00:05 2015 +1000

    move ZanataIdentityManager and ZanataJpaIdentityStore to under package seam

commit d82222c67898ef265bfbd9d30b6fa47058a8cf36
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 23 15:53:55 2015 +1000

    rename package name jass to jaas

commit ea72ebd4635db72a71e0a123bdce944f3d15514d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jul 23 15:51:22 2015 +1000

    in source seam's RunAsOperation

commit b4076e823e21b2f9ba80787d565a727d60cb6020
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jul 22 11:13:34 2015 +1000

    fix functional test

commit 8509d22294e13ed204a07bbf4b85abb356688dbd
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 21 17:28:41 2015 +1000

    fix error

commit 3cbe70fe9d7de3b815834edcba362d867200aff8
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 21 10:58:33 2015 +1000

    replace seam built-in components: userAction,userSearch,roleAction,roleSearch

commit f4e69eaac52160446e51878e3ada173c873715bc
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 21 10:55:24 2015 +1000

    migrate pages.xml restrict and require-login to jsf backed bean

commit 5e1c3686f682ae8b4c19e4883921728c9eb38855
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jul 15 13:08:44 2015 +1000

    ZanataIdentity no longer extends Seam Identity

commit eefa4965e76f74178bfa6291a91d71104eed89f6
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 14 11:57:07 2015 +1000

    migrate jsf to use identity instead of seam component

commit c8a97eafd92a91214f76b8170409e5d89043de7e
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 14 11:27:43 2015 +1000

    convert seam @Restrict to our own annotation and custom security interceptor


  Commit: ce51f92f454c1b2865166cea9aa39b3ff0a4508d
      https://github.com/zanata/zanata-server/commit/ce51f92f454c1b2865166cea9aa39b3ff0a4508d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

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

  Log Message:
  -----------
  fix(glossary): Fix glossary permission

https://zanata.atlassian.net/browse/ZNTA-615


  Commit: 75c2f34c674f0f9ef397282c70db9195f8257909
      https://github.com/zanata/zanata-server/commit/75c2f34c674f0f9ef397282c70db9195f8257909
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M etc/scripts/extractAppserver.groovy

  Log Message:
  -----------
  chore: check appserver properties before use


  Commit: 48ee1d0c49dda5430042feb413b452798be24a5e
      https://github.com/zanata/zanata-server/commit/48ee1d0c49dda5430042feb413b452798be24a5e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependency): update version for server-3.8.0


  Commit: 13b26d875cbeff1beaac25a9d8f2570ad2988b8e
      https://github.com/zanata/zanata-server/commit/13b26d875cbeff1beaac25a9d8f2570ad2988b8e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  fix(build): revert the zanata-assets to 7.4-SNAPSHOT


  Commit: 482e7b78bb0ed0e776d9b40c7533f1941e2cffe1
      https://github.com/zanata/zanata-server/commit/482e7b78bb0ed0e776d9b40c7533f1941e2cffe1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

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

  Log Message:
  -----------
  fix(ZNTA-627): check whether project iteration is found


  Commit: 329eaf567f087b2f1fdb35ef2c6e20952774006b
      https://github.com/zanata/zanata-server/commit/329eaf567f087b2f1fdb35ef2c6e20952774006b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  fix(ZNTA-628): fall back on locale's plural forms

Fall back on locale's plural forms when plurals header is empty.
Also simplify the code and improve log messages.


  Commit: 5f04dba0373d781aa923cae5cfb963e3fd8b9f9b
      https://github.com/zanata/zanata-server/commit/5f04dba0373d781aa923cae5cfb963e3fd8b9f9b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

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

  Log Message:
  -----------
  fix(ZNTA-629): check for null locale


  Commit: aba3f2e57b31971723066748294e4fcd739100ac
      https://github.com/zanata/zanata-server/commit/aba3f2e57b31971723066748294e4fcd739100ac
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

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

  Log Message:
  -----------
  fix(version language): Fix concurrent map modification

https://zanata.atlassian.net/browse/ZNTA-643


  Commit: 67f685ab1dfe970dcf01f5f1980c6dca682b81b1
      https://github.com/zanata/zanata-server/commit/67f685ab1dfe970dcf01f5f1980c6dca682b81b1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #932 from zanata/server-3.8.0-depencency

chore(dependency): update version for server-3.8.0


  Commit: 6ba040ca467347965f2907c4cd82c3697a16a4ef
      https://github.com/zanata/zanata-server/commit/6ba040ca467347965f2907c4cd82c3697a16a4ef
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  fix(ZNTA-638): upgrade ehcache


  Commit: 0f93756304fdfdabe5b5473ccaab870777315bee
      https://github.com/zanata/zanata-server/commit/0f93756304fdfdabe5b5473ccaab870777315bee
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into fix-concurrent-map


  Commit: b04843b6daae9f8f91ae14f62dc238d7ea184938
      https://github.com/zanata/zanata-server/commit/b04843b6daae9f8f91ae14f62dc238d7ea184938
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java

  Log Message:
  -----------
  fix(functional test): fix broken functional test


  Commit: 9076adb423c0b8a5f06b5ef94dd0f2f8ea3e2281
      https://github.com/zanata/zanata-server/commit/9076adb423c0b8a5f06b5ef94dd0f2f8ea3e2281
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

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

  Log Message:
  -----------
  feat(banner): change startup banner to show logo


  Commit: 1cf92473034ffbe238a6ce6c707f218c2fbb9293
      https://github.com/zanata/zanata-server/commit/1cf92473034ffbe238a6ce6c707f218c2fbb9293
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

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


  Commit: 82cdb572aa36eba3359a10bb6fbf24c391ab6097
      https://github.com/zanata/zanata-server/commit/82cdb572aa36eba3359a10bb6fbf24c391ab6097
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java

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

fix(functional test): fix broken functional test


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-615-glossary-permission


  Commit: fde026fd849e5f2ba33b8bca1dd51347a13c74c5
      https://github.com/zanata/zanata-server/commit/fde026fd849e5f2ba33b8bca1dd51347a13c74c5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

  Log Message:
  -----------
  ZNTA-594 - add pager to search and replace result table


  Commit: d287c2d5fcc5c2fa40a5339b78d5db03a5991370
      https://github.com/zanata/zanata-server/commit/d287c2d5fcc5c2fa40a5339b78d5db03a5991370
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #929 from zanata/ZNTA-615-glossary-permission

fix(glossary): Fix glossary permission


  Commit: 15de1d5b53f266b71b87c9d810df4f7a37e580d7
      https://github.com/zanata/zanata-server/commit/15de1d5b53f266b71b87c9d810df4f7a37e580d7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #942 from zanata/fix-concurrent-map

fix(version language): Fix concurrent map modification


  Commit: 298436f45959f0502b157b8eac40fb6b1652171f
      https://github.com/zanata/zanata-server/commit/298436f45959f0502b157b8eac40fb6b1652171f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  docs(release notes): update release notes for ZNTA-615 and ZNTA-643


  Commit: 5e54acfb0af3a60f5220228f8ad813f3d9606002
      https://github.com/zanata/zanata-server/commit/5e54acfb0af3a60f5220228f8ad813f3d9606002
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #941 from zanata/ZNTA-638-upgrade-ehcache

fix(ZNTA-638): upgrade ehcache


  Commit: b5fe9305ff445485df437d77152fb85a95b74e03
      https://github.com/zanata/zanata-server/commit/b5fe9305ff445485df437d77152fb85a95b74e03
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M etc/scripts/extractAppserver.groovy

  Log Message:
  -----------
  Merge pull request #930 from zanata/check-appserver-properties

chore: check appserver properties before use


  Commit: 3438fb2a5ccdced11ddd3283c9dddd7a70d6e461
      https://github.com/zanata/zanata-server/commit/3438fb2a5ccdced11ddd3283c9dddd7a70d6e461
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #936 from zanata/ZNTA-629-npe

fix(ZNTA-629): check for null locale


  Commit: e0b39aaaa1d2155d448ef3b4c65f596a21cbef54
      https://github.com/zanata/zanata-server/commit/e0b39aaaa1d2155d448ef3b4c65f596a21cbef54
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DataPage.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java

  Log Message:
  -----------
  fix(ZNTA-637): improve error messages


  Commit: 026e9895ac4c1427bb9924c183911ebb659dd7ed
      https://github.com/zanata/zanata-server/commit/026e9895ac4c1427bb9924c183911ebb659dd7ed
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  fix(ZNTA-628): generate default plurals when empty


  Commit: 4a4793da7b8603c331e161fdf0b7ae0661e23897
      https://github.com/zanata/zanata-server/commit/4a4793da7b8603c331e161fdf0b7ae0661e23897
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataHTMLLayout.java
    A zanata-war/src/main/java/org/zanata/log4j/package-info.java
    M zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java

  Log Message:
  -----------
  feat(logging): include MDC values and time in emails


  Commit: 73d512b67af6f324e0414c2b6710766731fb2ead
      https://github.com/zanata/zanata-server/commit/73d512b67af6f324e0414c2b6710766731fb2ead
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

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

  Log Message:
  -----------
  Treat blank plurals header as missing too


  Commit: 4adc66b32ac74d9577ca0217a10e3ad5d283a212
      https://github.com/zanata/zanata-server/commit/4adc66b32ac74d9577ca0217a10e3ad5d283a212
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Merge pull request #935 from zanata/ZNTA-628-empty-plural-forms

fix(ZNTA-628): fall back on locale's plural forms


  Commit: 6ac8d8a3b9172166d4c96416c6bc79f6be0d1f23
      https://github.com/zanata/zanata-server/commit/6ac8d8a3b9172166d4c96416c6bc79f6be0d1f23
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  perf(liquibase): merge addColumn changes


  Commit: f7db625f9a0c6a60fad8afe736a6c8bcba78ffcf
      https://github.com/zanata/zanata-server/commit/f7db625f9a0c6a60fad8afe736a6c8bcba78ffcf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  Add UsernameLoggingFilter to work with new security code


  Commit: c1eeeff9a55dbc5e6ebcf8d966ddaef12b3085a5
      https://github.com/zanata/zanata-server/commit/c1eeeff9a55dbc5e6ebcf8d966ddaef12b3085a5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  feat(ZNTA-594): Add tooltip to Select All checkbox


  Commit: 024a24a052774e2376b21df60a4c7291c2d5e373
      https://github.com/zanata/zanata-server/commit/024a24a052774e2376b21df60a4c7291c2d5e373
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #944 from zanata/ZNTA-594-search-replace-limit

ZNTA-594 - add pager to search and replace result table


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  chore(Travis): enable Docker builds for Travis, plus Arquillian

- tell Travis to use container(Docker) for builds
- tell Travis to cache Maven repository
- use egrep to keep log size within Travis limits
- stop ignoring build failures on Java 1.8
- enable Arquillian integration tests


  Commit: 7650aea1e6863ae1bb1eebc29061c10f54547d70
      https://github.com/zanata/zanata-server/commit/7650aea1e6863ae1bb1eebc29061c10f54547d70
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  fix(version language): Fix concurrent map modification

https://zanata.atlassian.net/browse/ZNTA-643


  Commit: 4eb520c48c1033f212d94561080322d18b60b030
      https://github.com/zanata/zanata-server/commit/4eb520c48c1033f212d94561080322d18b60b030
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  fix(glossary): Fix glossary permission

https://zanata.atlassian.net/browse/ZNTA-615


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataHTMLLayout.java
    A zanata-war/src/main/java/org/zanata/log4j/package-info.java
    M zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java

  Log Message:
  -----------
  Merge pull request #946 from zanata/ZNTA-653-mdc-email

feat(logging): include MDC values in log emails


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

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

  Log Message:
  -----------
  Merge pull request #951 from zanata/usernameloggingfilter

Add UsernameLoggingFilter to work with new security code


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore: add enforcer exception for system bytecode


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

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

  Log Message:
  -----------
  perf(liquibase): merge addColumn changes

(cherry picked from commit 6ac8d8a3b9172166d4c96416c6bc79f6be0d1f23)


  Commit: 1146734fab03bac996aaad75b4e171c80c2fb8b5
      https://github.com/zanata/zanata-server/commit/1146734fab03bac996aaad75b4e171c80c2fb8b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataHTMLLayout.java
    A zanata-war/src/main/java/org/zanata/log4j/package-info.java
    M zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java

  Log Message:
  -----------
  feat(logging): include MDC values and time in emails

(cherry picked from commit 4a4793da7b8603c331e161fdf0b7ae0661e23897)


  Commit: 909a5dcaa0872a1827d948bf4eb7d1f5b602c9a8
      https://github.com/zanata/zanata-server/commit/909a5dcaa0872a1827d948bf4eb7d1f5b602c9a8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #955 from zanata/travis-docker-cache

chore: use Docker builds for Travis, with caching


  Commit: 3d0ee20d46bb29821a308d7a173558c1dc70b2d7
      https://github.com/zanata/zanata-server/commit/3d0ee20d46bb29821a308d7a173558c1dc70b2d7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  chore(Travis): enable Docker builds for Travis, plus Arquillian

- tell Travis to use container(Docker) for builds
- tell Travis to cache Maven repository
- use egrep to keep log size within Travis limits
- stop ignoring build failures on Java 1.8
- enable Arquillian integration tests

(cherry picked from commit e05e63a6996b5309d1dceaa56add0658579c92ef)


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

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

  Log Message:
  -----------
  feat: add InternalLoginModule alias


  Commit: 22c184597c5f8d2a3e1732e731d4388226a9f7ea
      https://github.com/zanata/zanata-server/commit/22c184597c5f8d2a3e1732e731d4388226a9f7ea
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/log4j/ZanataHTMLLayout.java
    A zanata-war/src/main/java/org/zanata/log4j/package-info.java
    M zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java

  Log Message:
  -----------
  Merge pull request #954 from zanata/backport-ZNTA-653-mdc-email

feat(logging): include MDC values and time in emails


  Commit: 059aefaa274e587c1829278c4dae7d93f28f9e6a
      https://github.com/zanata/zanata-server/commit/059aefaa274e587c1829278c4dae7d93f28f9e6a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #952 from zanata/merge-addColumn

perf(liquibase): merge addColumn changes


  Commit: 0b66d11dfee98f9f7139c8d161376384e3e15fdb
      https://github.com/zanata/zanata-server/commit/0b66d11dfee98f9f7139c8d161376384e3e15fdb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #953 from zanata/backport-merge-addColumn

BACKPORT perf(liquibase): merge addColumn changes


  Commit: 7f3374c7f61848234fb01367d620a4c103a8c824
      https://github.com/zanata/zanata-server/commit/7f3374c7f61848234fb01367d620a4c103a8c824
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.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/RevertTransUnitUpdatesHandlerTest.java

  Log Message:
  -----------
  test: fix NPEs where ResourceUtils is used


  Commit: e2d90080cc682122cb3d1929ec28ae06867b144c
      https://github.com/zanata/zanata-server/commit/e2d90080cc682122cb3d1929ec28ae06867b144c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

  Log Message:
  -----------
  ZNTA-594 - add pager to search and replace result table


  Commit: 8e08642c9b1de53bd254496dcc95e5fb92e42b5b
      https://github.com/zanata/zanata-server/commit/8e08642c9b1de53bd254496dcc95e5fb92e42b5b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

  Log Message:
  -----------
  feat(ZNTA-594): Add tooltip to Select All checkbox


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore: use JVM version for tools jar


  Commit: 6ae9087e0b47c135b4573d8c3de48b7afda72a29
      https://github.com/zanata/zanata-server/commit/6ae9087e0b47c135b4573d8c3de48b7afda72a29
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/SysProperties.java

  Log Message:
  -----------
  Merge pull request #924 from zanata/boost-lucene-query

Boost Lucene query using TFT metadata


  Commit: 112c72c84569549f92ab4670ce440c785048a519
      https://github.com/zanata/zanata-server/commit/112c72c84569549f92ab4670ce440c785048a519
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #934 from zanata/copytransnullcheck

fix(ZNTA-627): check whether project iteration is found


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

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

  Log Message:
  -----------
  Merge pull request #957 from zanata/add-InternalLoginModule

feat: add InternalLoginModule alias


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  chore(Travis): wait for dependencies to download


  Commit: 17be3bf26f0e6db7811492c0964135230a402908
      https://github.com/zanata/zanata-server/commit/17be3bf26f0e6db7811492c0964135230a402908
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependency): Update dependency for 3.7.2 release


  Commit: 88544e626afe52efe543862fcb65d250def61c22
      https://github.com/zanata/zanata-server/commit/88544e626afe52efe543862fcb65d250def61c22
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.7.2-rc-1


  Commit: 159d45e96ddd266b8a5e1b9751de58045f2f0945
      https://github.com/zanata/zanata-server/commit/159d45e96ddd266b8a5e1b9751de58045f2f0945
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

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


  Commit: 15ab7d835a3b052151a9079dd43e4027348c5abc
      https://github.com/zanata/zanata-server/commit/15ab7d835a3b052151a9079dd43e4027348c5abc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-08 (Tue, 08 Sep 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
    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/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/dashboardsettings/DashboardAccountTab.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/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/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.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/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/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java

  Log Message:
  -----------
  feat(test): Add text screenshots and improve text input

Squashed commit of the following:

commit 83d5f7bac31be42eeee5375d190942a78a561e49
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Aug 21 15:16:47 2015 +1000

    fix(test-screenshot): Screenshots taken before text fully entered

    Use Actions for entering text. sendKeys appears to be quite difficult
    to use for getting appropriate screenshots.
    Also fix some fields that cannot be accessed by the Actions chain,
    via direct injection.
    Add some documentation and logging.

commit a5f85a3f86fbb4f016278f8952c3f1baa345fdee
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Aug 21 12:54:06 2015 +1000

    refactor(tests): Use the enterText/Actions function

commit 37857849e1ac5c5c262dd85e0f12569ce22b03e7
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Aug 21 12:41:31 2015 +1000

    feat(custom-text-screenshots): Add custom screenshot feature to testing

    Screenshots, if enabled, can be requested at any point in a test.
    Add pre-post text entry screenshots for both event and Actions methods.
    Also fix error in Administration config test page for PoC.


  Commit: 8a82d95622d23a313bf7c7143729bbc57c727dcd
      https://github.com/zanata/zanata-server/commit/8a82d95622d23a313bf7c7143729bbc57c727dcd
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  fix(CI): Disable server settings test


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #963 from zanata/disable-server-config-test

fix(CI): Disable server settings test


  Commit: 113f9a62d83d1f7ea674a582dd3bc125437f83b8
      https://github.com/zanata/zanata-server/commit/113f9a62d83d1f7ea674a582dd3bc125437f83b8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

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

  Log Message:
  -----------
  fix(test):Remove deprecated 3.7 functions in functional-test


  Commit: 55acd054ed07af641f92baacb879c747bc96c54b
      https://github.com/zanata/zanata-server/commit/55acd054ed07af641f92baacb879c747bc96c54b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    M pom.xml

  Log Message:
  -----------
  test: Ensure that DetailedTestSuite includes BasicAcceptanceTest


  Commit: fb5e9cc7990166f816812c33198eb0a2268f7b9c
      https://github.com/zanata/zanata-server/commit/fb5e9cc7990166f816812c33198eb0a2268f7b9c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #962 from zanata/DetailedTestSuite-include-BasicAcceptanceTest

test: Ensure that DetailedTestSuite includes BasicAcceptanceTest


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

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

  Log Message:
  -----------
  Merge pull request #961 from zanata/remove-ft-deprecated-3.8

fix(test):Remove deprecated 3.7 functions in functional-test


  Commit: 3776c2405b82796c85af5c0f29434967138c56a9
      https://github.com/zanata/zanata-server/commit/3776c2405b82796c85af5c0f29434967138c56a9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DataPage.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java

  Log Message:
  -----------
  Merge pull request #947 from zanata/ZNTA-637-improve-error-messages

fix(ZNTA-637): improve error messages


  Commit: 557b58c5b34490935bdfa292402008f1c476e045
      https://github.com/zanata/zanata-server/commit/557b58c5b34490935bdfa292402008f1c476e045
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    R zanata-war/src/main/webapp/resources/zanata/text-search.xhtml

  Log Message:
  -----------
  refactor: delete obsolete composite text-search


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

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml

  Log Message:
  -----------
  fix: add rich: namespace explicitly


  Commit: a1bdbd8b3f0a4ce54d08745768010fb1f18a6464
      https://github.com/zanata/zanata-server/commit/a1bdbd8b3f0a4ce54d08745768010fb1f18a6464
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

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

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


  Commit: 52d3f6abfa7c555234dd5085c1f06a16d19a5030
      https://github.com/zanata/zanata-server/commit/52d3f6abfa7c555234dd5085c1f06a16d19a5030
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

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

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


  Commit: 1ac149e8f09f31195cd66a41073c553483a9dabd
      https://github.com/zanata/zanata-server/commit/1ac149e8f09f31195cd66a41073c553483a9dabd
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): release-notes for 3.7.2


  Commit: 3eadbbe5b3ae0474d3301f6148da2d8f414309ad
      https://github.com/zanata/zanata-server/commit/3eadbbe5b3ae0474d3301f6148da2d8f414309ad
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): release-notes for 3.7.2


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

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

  Log Message:
  -----------
  Exclude Hibernate Search module

This helps with WildFly 10 compatibility.


  Commit: b0e0184ef104f1617d8fe405d4a89cb03acc9afc
      https://github.com/zanata/zanata-server/commit/b0e0184ef104f1617d8fe405d4a89cb03acc9afc
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    A docs/images/project-people-manage-permissions.png
    M docs/images/project-translation-settings.png
    A docs/images/project-view-people.png
    M docs/images/project-view-versions.png
    M docs/user-guide/languages/language-team.md
    M docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/project-team.md
    M docs/user-guide/projects/project-view.md
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectPeoplePage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccountOption.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/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
    A zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    A zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/LocaleRole.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    A zanata-model/src/main/java/org/zanata/model/ProjectRole.java
    A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleType.java
    A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleType.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    A zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/java/org/zanata/dao/ProjectLocaleMemberDAO.java
    A zanata-war/src/main/java/org/zanata/dao/ProjectMemberDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/people-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/person-permissions-modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/main/webapp/resources/script/jsf-ajax-viewstate-fix.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/main/webapp/resources/zanata/person-permission-entry.xhtml
    A zanata-war/src/main/webapp/resources/zanata/person-tile.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    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/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  feat(project-roles): add project-specific roles (ZNTA-524)

Squashed commit of the following:

commit 022f5b55f9936684e91af2617e23724cd51e64c1
Author: David Mason <drdmason at gmail.com>
Date:   Wed Sep 9 10:35:11 2015 +1000

    fix(version-group): ensure languages, projects and maintainers can be added properly

    The override of create() was calling getInstance() before a slug was available, so creating
    an empty instance that caused failures later.
    The maintainer autocomplete was not using service locator to look up a fresh copy of
    versionGroupHome, so this was added to prevent a NullPointerException.

commit 72d2c156bc7f496d88304736a6ee848649fae6ea
Author: David Mason <drdmason at gmail.com>
Date:   Wed Sep 9 08:40:55 2015 +1000

    fix(project-roles): add notification when invite-only setting changes.

commit 67f3c80106955d23d147457960c192daf78e08de
Author: Damian Jansen <djansen at redhat.com>
Date:   Tue Sep 8 13:51:04 2015 +1000

    fix(test): Fix functional tests for new People ui

commit 396d1bb07a0928aa72a65656b8bcc3e25a75fd73
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 16:32:19 2015 +1000

    perf(security): add caching to some queries used in security checks

commit 871e9093b2abd97414ffc14db53a7b337ba5b190
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 16:21:21 2015 +1000

    fix(tm): ensure TM import dialog is shown properly

commit 20754296f0f27317ea1f820edbec59cc6a9d71de
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 13:54:43 2015 +1000

    fix(project-roles): throw exception if user attempts roles edit

    The UI does not allow roles edit if a user is not authorized, but this
    check will give some feedback if a user manages to work around it or a
    bug is introduced that prevents the UI from hiding the functionality from
    users who are not authorized to use it.

commit 9ba9e65b85b0cb1af4134fc5e1e8ee38455077db
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 13:45:42 2015 +1000

    fix: prevent error when maintainer tries to import translations

commit 6ed731c4bf18aef0dc85748c7ec6d13e96fc0a25
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 13:41:03 2015 +1000

    fix(copy-trans): prevent error in security check for copy trans

    Had both a null target for the check, and a lazy collection issue.

commit b16d944d4865f6f68d2b23ff162e7d1b0409372b
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 12:58:51 2015 +1000

    fix(copy-trans): ensure copy-trans dialog appears when it should

commit 9019fbfd6d8efd7d6d2ceae0ee3e9a282cdc8372
Author: David Mason <drdmason at gmail.com>
Date:   Fri Sep 4 09:28:03 2015 +1000

    fix(project-roles): update people count on tab when roles change

    Was not updating until page refresh, so the number was wrong when someone
    was added or removed from the project.

commit ace1b409c896d35ad98ffc3f0e65a6ad5620c52a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 16:59:29 2015 +1000

    fix(project-roles): prevent last maintainer being removed.

commit 7fb493470fd93e8d745541a7f7e5b91b70d6c85d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 15:38:25 2015 +1000

    fix: prevent error after request to add version to group

commit 82cd279203ffada1f1ab45057c2b9cd3d05d164f
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 15:36:48 2015 +1000

    fix: prevent lazy collection error when viewing groups

commit e8231e1e5991d0a46d1900db0711c751efe6dc53
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 13:11:48 2015 +1000

    fix(permissions): avoid an error state when checking translation comment permissions

    A lazy instantiation exception was occurring when checking HPerson.isMaintainer(HProject) in
    security functions to check for review comment permissions.
    A few missing review comment rules were added as well.

commit 644f391bc70f72159565c37f1897ffddb46ce04b
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 12:49:48 2015 +1000

    refactor: remove excess whitespace

commit 7fd9315a000d285771e06e63004594145d25e625
Author: David Mason <drdmason at gmail.com>
Date:   Thu Sep 3 12:47:55 2015 +1000

    docs(project-roles): add docs for project roles

    Includes a few modifications to related docs, and some updated screenshots
    where the Maintainers tab was shown, since it has changed to the People tab.

commit 1c312992cd092ba19d56e3f9a8df30fbd7845fbb
Author: David Mason <drdmason at gmail.com>
Date:   Wed Sep 2 09:23:50 2015 +1000

    fix(project-delete): make sure project delete button works

    Project delete button was failing because the click event triggered modal hide
    immediately after modal show. Changing to the standard data-attributes for modal
    toggling fixed the problem.

commit 20b87e90df10aeb83cd1b1beaab261cce6cc1d81
Author: David Mason <drdmason at gmail.com>
Date:   Tue Sep 1 10:12:06 2015 +1000

    refactor(project-permissions): make all UI text translatable

commit 2a2761b20dee874b017403c132eed50fcdb04cef
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 17:13:41 2015 +1000

    refactor(project-roles): make UI strings translatable

commit 2e3b76c064abc2868f26cf3aa9a4512e0d4eab1c
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Aug 31 16:06:42 2015 +1000

    fix: security permission check runs into an infinite loop

commit 7d8af49cffb54166d5768018f0f8060318fb9161
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 16:03:52 2015 +1000

    fix(project-roles): show locale roles in consistent order

commit c8617db5643868b15e7ec3c40c3dae64c3d23a3d
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 14:58:08 2015 +1000

    fix(project-roles): display locales in correct order project people

    Was not sorting locales, so they would be shown in whatever arbitrary order they
    were retrieved from the database. Now sorting alphabetically by lowercase display
    name.

commit 911b4aefed859a891460022f5c9ec69c85d8bfe7
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 14:18:44 2015 +1000

    fix(project-roles): always show people in alphabetical order

    Was sorting by display name, but showing username. Changed to sort by
    username, and made sure the list of people under locale groups are in
    order as well.

commit 4725ccaf7d67af6ceeb5334546568691ed8f67e2
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 11:43:01 2015 +1000

    fix(project-permissions): show locales in correct order in permission dialog

    Was showing in default ordering. Now show in alphabetic ordering.

commit 80e3fff606ff5aaafb4b3266c1dc3ec54689a99d
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 31 09:46:09 2015 +1000

    fix: scroll permission modal to top whenever it opens

    This is also fixed in assets, but there may be some issues with updating assets version
    at the moment so I chose to add a safe workaround for now. There will be no harm when
    the assets version is updated, but this change can be reverted when assets is stable and
    updated.

commit bdb52fc51bc52b7acd70d3d1c5bd17c6b3da4500
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 16:59:03 2015 +1000

    refactor: remove seam taglib from jsf templates

commit 8f5a3bbade7098847b6fe1c14822c0c86a3236fc
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 16:14:50 2015 +1000

    refactor: use tryFind instead of for loop to improve readability

commit 3f8158be19392079f00cf4f7f94192cba7551f92
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 15:55:47 2015 +1000

    refactor: remove excessive logging

commit b1c76b4e25005f0afd1862d2dfd73a5f1ac6b972
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 15:55:34 2015 +1000

    refactor: add explanatory comment

commit 774d4345d738b0158b19a67a733854626f4f6864
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 15:55:11 2015 +1000

    refactor: fix typos

commit 1baf96dc8bc1098b95b4830596e374f7f89654d3
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 15:34:48 2015 +1000

    fix(equals): add missing equals from some entities

    Were hitting the assertion in ModelEntityBase.equals() that ensures they have
    overridden equals. Specified `of = {}` for some classes to prevent a circular
    reference from trying to check properties that have a link back. All that should
    be needed is the identifier in the super equals, and the class check.

commit 60716e639c3de7f86cf79b269606b39fd0c970ad
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 14:48:16 2015 +1000

    test: update test data to match new database structure

    Addition of required field HProject.allowGlobalTranslation and removal
    of HProject_Maintainer (replaced with HProject_Member) were causing test
    errors.

commit 113126ddecb3715e62ec9587b2083c0e041d1cdc
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 14:47:10 2015 +1000

    refactor: return immutable list as immutable list rather than general list

commit 8465fa48d5e5f1e7f1efa8d0d46c46b250d63ff1
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 11:35:19 2015 +1000

    test(SlugEntityBase): ensure that test properly overrides equals and hashCode

    The test class was not following the requirement to override equals for all
    subclasses of ModelEntityBase.

commit cb7643b050f168349fc063c1cd1eaaf2da5379b6
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 11:27:30 2015 +1000

    refactor: add newline to end of file

commit fb609abee79caba647ad12e19a867874fe564256
Merge: 3438fb2 fdb2494
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 10:59:31 2015 +1000

    Merge branch 'project-roles-ui' into project-roles-final

    Conflicts:
    	pom.xml
        Just had assets version updated in the branch, and adjacent lines
        had been updated in master. Kept assets version from branch and
        the rest from master.

commit fdb249453c028cc88b51a8033c623d6bc99a2bf2
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 27 10:14:59 2015 +1000

    fix: correct button alignment

commit b5eb0ac270ae2c0a1b9ef9eed1d8da09b4190c35
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 17:18:19 2015 +1000

    fix(project-roles): refresh project permissions display when permissions are saved

commit f075fd9043f29ed2ac84ca2ef4ff2331cb374b9e
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 17:16:08 2015 +1000

    refactor: rename jsf ajax viewstate fix script

commit 35bd793e8c77f7adb61e8bff5d4f19e45de5e36c
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 15:42:12 2015 +1000

    refactor(ProjectPermissionDialog): remove unused conversation scope

    The conversation scope was a workaround for a deficit in jsf that made it lose
    the page scope in some cases where ajax is involved. The script named
    jsp-ajax-viewstate-fix.js replaces the missing jsf functionality, so the
    conversation scope can be removed.

commit 2aacc304801d226b3d266fce4c9f89b92f1ec048
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 15:31:46 2015 +1000

    feat(project-roles): customize permission submit button depending on person selected

commit 846af7fae3e06b84468b1b4799c6be0e21f9ae46
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 15:02:04 2015 +1000

    change permission dialog title depending on selected member

commit bbb6c36402f49b0a6413e37f4a5df4ee4ccb08e5
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 14:48:01 2015 +1000

    only show permission options when a person is selected

    Note: the only change is moving a closing tag of <s:fragment> lower to
    encompass more of the code (see first and last line of diff). The other
    changed lines just have an extra 2 spaces of indentation.

commit 9cf52e65fd8d1771d1da4afc6464ecaf17d1e3bb
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 14:16:10 2015 +1000

    feat(project-roles): use separate bean for project permission dialog

    A separate bean is used to work around problems with losing the page scope
    between ajax requests.

commit f065224c20b1fc84aa239207128df36dbe55114d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 14:06:02 2015 +1000

    feat(project-roles): add button to clear selected user from permission dialog

    This includes a script that works around a bug with ajax and jsf.

commit 9f60fab434b946eafc1d48e1e71f4afb4b346dbe
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 26 11:27:49 2015 +1000

    fix(project-roles): show correct roles when grouping people by role

    Was showing all roles in every category, rather than just the roles appropriate
    to the category. This changes so only the appropriate roles are shown in each category.

commit 77e6cdbe726778204d3254801df95388f3d16441
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 25 12:41:37 2015 +1000

    refactor: fix up indentation on person-permission-modal.xhtml

commit 32208b0fee6a1865b1bce55256cec4970134679a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 25 12:26:30 2015 +1000

    add person selector to persion-permissions-modal

commit 1d96517860ba4c06fe95a1e33ee51cd57ce95425
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 25 12:00:01 2015 +1000

    add backend for person selector in permission dialog

commit c2f2fd62e5ed6e64ff80cc1c44a0800fec3f4cc5
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 25 12:15:10 2015 +1000

    change the refresh area on project permission modal

commit 35cfec080bbd8e6fa90550dfc109f89af66fa9ec
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 24 14:17:53 2015 +1000

    feat(project-roles): show explanatory text for maintainer roles

    Shows text for maintainer and translation maintainer that lists the actions
    that are allowed, depending which is selected.

commit 6b5d1ea95e73972fce148081911b3768ae9d7be4
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 22:42:22 2015 +1000

    fix(project-roles): show people who are not maintainers

    Was only showing people with Maintainer or TranslationMaintainer role
    (but was showing locale-related roles for those people if they had them).
    Just needed to combine the list of people with project roles and with
    locale roles to get the full list.

commit 7ee13f103492ed833165515bfe90a8b84633f69d
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 19:55:03 2015 +1000

    feat(person-permission-dialog): check and disable TranslationMaintainer checkbox when Maintainer is selected.

commit 67d32b134c259fadec92b4f6b05a50897b5ee04c
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 12:24:32 2015 +1000

    fix(project-people): fix typo in style class on button

commit 70f8d70e74063abec4d9837e0939a5e2df9e465e
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 12:12:13 2015 +1000

    fix(security): do not output every user email address in the DOM

    User email address was being output as the id of a DOM element, which is easily seen
    by anyone with a browser. It looks like the id was not even being used anywhere.
    I do not know why this was done. Was it an attempt to generate a unique ID for each
    list item? The same person can be output in multiple categories so it would not have
    been unique anyway. I just removed it, and the list still seems to work properly.

commit fa3712cca3d64a0dc84d091f7734697a61207f20
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 12:07:31 2015 +1000

    refactor(person-permission-entry): rename people-entry to person-permission-entry

    people-entry was misleading (because it only shows a single person) and too general.

commit 13e22bf248a7dc6bf0b2595f5f9a305a854752a9
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 11:34:57 2015 +1000

    refactor(ajax-command-button): revert addition of unused onclick property

commit d41a55624897542039fbe82e79c1a136c665fd86
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 21 11:30:31 2015 +1000

    refactor(person-permissions-modal): use the passed-in id as basis for other identifiers

commit 25dca43590250d00ee9d6d5daf23b34220e140ce
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 17:10:43 2015 +1000

    refactor(people-tab): move manage permissions dialog to separate file

commit c3e6cc8ee3eec8b1d9d7b311de028447b1031a9b
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 16:38:44 2015 +1000

    feat(people-tab): improve readability and move a few elements around

commit 73f3efd5f0528c8685be2b9ed758f8248e60efb4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 14:39:46 2015 +1000

    refactor(people-tab): use short prefix for zanata composites

commit d48d1ce263900ac783d49da7c9fd6ace328b8b7f
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 14:36:02 2015 +1000

    refactor: remove unused code, rename a function

commit 3c94e6871079b18f31fc15e2ede20d5c1d5495a1
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 14:13:50 2015 +1000

    refactor: add missing copyright notice

commit 5fe69a407a987a5bcf6e198d92461a3ec85e524a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 14:08:28 2015 +1000

    refactor: delete unused file

commit acbe4ae9e6dac26c25ed45e34cee06901063e8e4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 14:03:52 2015 +1000

    refactor(ProjectHomeAction): move fields, simplify logic.

commit 690368b6d1630582c8867ab48f817aeda692cb12
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 13:02:22 2015 +1000

    refactor(ProjectHomeAction): clarify javadoc and simplify logic

commit 3de8fed8cc80a85da75b5d616d84b3f109902b60
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 11:53:27 2015 +1000

    feat(project-roles): display people roles more concisely

    - If user is both Maintainer and TranslationMaintainer, only show Maintainer
      because it includes all the TranslationMaintainer privileges.
    - Display a single line for all the roles in a single locale.

commit 6dfea7e03f9fc65c2c84058927c19ff3d75ea57f
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 10:53:38 2015 +1000

    refactor(PeopleFilterComparator): remove unused display values

    It was populating a map of person to role display values, but the display
    values are now generated elsewhere. Removed the display values to leave just
    a list of HPerson.

commit 8f852ff76269b1176b6fc8dff919757f921eae47
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 10:41:41 2015 +1000

    refactor(ProjectHomeAction): remove unused, fix license indentation, rename

commit 1c1fb01c168c99b413f411f8a12060fe057053c6
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 10:20:46 2015 +1000

    refactor(ProjectHome): general cleanup (remove unused, rename, move)

    - remove unused imports
    - remove excessive logging
    - remove unused code
    - move a predicate definition nearer where it is used

commit 452795fcca9c492b0e6c553875e23dcdbebeb030
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 10:09:00 2015 +1000

    refactor: whitespace and comment wording changes

commit f4ccc96d94edb40262ecb0ad3d538c04ece0797a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:42:22 2015 +1000

    refactor(ProjectPersonMemberships): minor improvements and cleanup

     - remove unused imports
     - add more javadoc
     - use getters for a few more things, rather than fields

commit 51bf6d97a0de78794f42baaf7c87fe2a5c7383e7
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:33:48 2015 +1000

    refactor(ModelEntityBase): add note about why subclasses must override equals

commit 814288baed9734799b7e71753c57a9627efc16e1
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:28:06 2015 +1000

    refactor(HProjectMember): use getters for everything in equals+hashCode

commit 82c8df8f983189368a65956d5afd213a1ba71aad
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:22:10 2015 +1000

    refactor(HProjectLocaleMember): use getters for everything in equals+hashCode

commit 60eff0fc39ebef4e848eeb591bf7582b20ad13b1
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:22:00 2015 +1000

    refactor: remove unused import

commit adadf40ca56b2980b766827a4ca040db8049720a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:10:09 2015 +1000

    refactor: improve javadoc

commit afe270f30abae3d316e6a5846a09b88af6fdbdbc
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:09:46 2015 +1000

    refactor: remove unused code

commit 14e36771f5681bf5d0827f9d993b7a1fafa783eb
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 09:06:00 2015 +1000

    refactor: make comment more accurate

commit 80f320406c29e4ca1815097616d383d9fedff782
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 20 08:36:35 2015 +1000

    fix(project-people): ensure people list is sorted initially

    List was starting in a random order and would sort only when some
    change was made to sorting settings. Fixed so list is always sorted
    with the current sort options regardless whether it is the first
    load or the data is flushed and regenerated.

commit 1a3e3f10fe9fc0066a35f2aaa4b3c6a39e7f0bf3
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 19 10:51:06 2015 +1000

    fix(project-roles): apply security permissions correctly for changing project permissions

    Makes sure that project permissions can only be updated by an admin or Maintainer, and that
    project-locale permissions can only be updated by an admin, Maintainer or TranslationMaintainer.

commit 80cc6e8c47ac66a9b0cb42f1f526c184103d53c7
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 19 10:48:33 2015 +1000

    fix(permissions): update some permission checks for new security system

    These are a few checks that were causing problems after merging master to
    this branch, which brought in the new security system.

commit a94ae732c417d9457aa1c23aa51af60ff98516f4
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 19 10:39:48 2015 +1000

    fix(PermissionGranter): allow proxies to match accepted types

    The target object for permission was having its class checked using an == comparison,
    which returned false for proxy objects. The check is changed to isAssignableFrom so
    that any valid subclass (including a proxy) will satisfy the check.
    This does mean that if any of the entities we check security for is a subclass of
    another entity we check security for, there is potential for a false-positive match,
    but none of our entities inherit in that way.

commit fc113c13667509d43504048ab4856729b6f5aa24
Merge: 507c917 9d0387e
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 18 16:29:45 2015 +1000

    Merge branch 'master' into project-roles-ui

    Conflicts:
    	pom.xml
    	zanata-model/src/main/java/org/zanata/model/HProject.java
    	zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    	zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    	zanata-war/src/main/webapp/project/project.xhtml

commit 507c9176c72987000b235e1de413a541a8211003
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 18 15:19:44 2015 +1000

    WIP: prevent setting project-level permissions when not allowed to.

    Still needs to restrict properly on the server. The restrict is not working now.

commit 0ae2b58feb1d28e636b64cf6338ee3bb4f5874c4
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 16:45:05 2015 +1000

    refactor: fix indentation on project people permissions dialog.

commit d7ea646764248e2bacdf689324292fea9a14f909
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 16:13:18 2015 +1000

    do not show people as project members when they have no roles

    People were being temporarily shown in the project list with no roles when
    they should have been completely removed. It was just a caching issue with
    the people sorting object.

commit fc6824bf754a79ba79ebd6757e99256433ed2475
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 15:56:39 2015 +1000

    change submit button text when no project permissions are selected

    Changes the text to make it clear that the person will be removed from the
    project, since they have no selected permissions.

commit 2e7c069c810117f164ec701ce607c81d56251a98
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 13:44:43 2015 +1000

    show all enabled languages in person permission dialog

commit 1105a766949be148eaedb10c46baa3ba6c2b70ee
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 13:44:31 2015 +1000

    remove unused UI elements from person permission dialog

commit 4c4964b007c51d53a55e3af34a82d6c1402fe107
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 17 12:40:26 2015 +1000

    fix(entities): ensure entity equality works on proxies and is idempotent

    Hibernate proxy entities were causing a problem because of the getClass() comparison
    in ModelEntityBase.equals().
    There were also many comparisons in equals and hashCode that used field comparisons,
    which can give false null values in proxies. All these were changed to use method
    accessors.

commit 9ccc67210d7dd069007094f4a2e5fe0723d8ac7f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 14 14:19:35 2015 +1000

    Clear cached project entity after edit role

commit 55751c3ffe35a414dc226dbf09787be92e1d78b4
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 14 11:32:01 2015 +1000

    WIP: ensure that roles persist properly.

commit 601fee7577b0e0247963c1b8acbcf2a431000689
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 13 11:27:55 2015 +1000

    use method form of ID for entity equality and hashcode calculations

    Field for ID may not be populated in hibernate entities, so the only
    reliable way to ensure the ID is not null is to use a method to access
    it. Using method access allows hibernate to intercept the method call
    and return the id correctly.

commit daea2ce018b7c9f96f93ac54d6a1e3c442f0d4e2
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 11 13:37:45 2015 +1000

    WIP: add/remove project role without an error

commit bc8a046e4fa6b0b4dfe458ef31a0239e80f6921e
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 6 15:51:47 2015 +1000

    Rerender people tab when role changed

commit c969376f33bbeab813c41497c5b5d86759be7193
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 6 15:39:46 2015 +1000

    Persist project and locale role permission for HProject

commit 1c3a03bc8b71745c48cb226164727b1063142f75
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 6 12:58:35 2015 +1000

    Move button back to modal

commit 126dd7d0d9aa0d8e697de5eef5d2e49aac1f6c3d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 6 12:55:20 2015 +1000

    WIP: moved modal code inline

commit 0de34987510f3b5628859317dfff9427d0f92397
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 6 12:08:00 2015 +1000

    WIP: it is broken

commit 8bc83edc47a999257f1c28daeb14072bdd759c59
Merge: f7abb09 87113ae
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 30 12:06:29 2015 +1000

    Merge remote-tracking branch 'origin/project-roles-ui' into project-roles-ui

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/ProjectHome.java
        Most of the new methods are moved from here to ProjectHomeAction,
        so I kept the deletion of them.

    	zanata-war/src/main/webapp/WEB-INF/layout/project/people-tab.xhtml
        Merge tools were having many problems with this, so I just used
        the remote one and will manually add the couple of things I care
        about.

commit f7abb097ac30d8282be71c8c95d7cc8be94ead18
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 30 10:50:49 2015 +1000

    WIP: add save method for modal dialog

    Probably needs moving to ProjectHomeAction for scoping reasons.

commit 0cafdb1507b82070264a3564e4e2f8a80bf3e2c6
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 30 10:49:53 2015 +1000

    feat: add onclick to ajax-command-button

commit 0a6060d304174e8f7367942b1fe0fb330087c2b2
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 30 10:49:23 2015 +1000

    WIP: making submit work for person dialog.

commit 7888977e89d044f7bcf546498fe7c3c9ec2fade9
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 30 10:47:11 2015 +1000

    WIP: allow setting of all a person's memberships in HProject

    This still has some logging that needs cleaning up.

commit 9ba89baabfe51f7418baa7a1b6b22dfc763e86a3
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 20:50:49 2015 +1000

    WIP: now single button to open each modal

commit d800f62713e62ad2256117afaf456c44c26e77c0
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 20:23:42 2015 +1000

    WIP: show locales in person-permissions-modal

commit b504a0eb1a8d5ce4fa0ee1be88d9e0566791ccad
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 20:12:11 2015 +1000

    use standard person tile in people page

    Made this a separate commit because it will probably conflict with some other
    changes, so easier to keep it separate from other files that are less likely
    to conflict.

commit e8f6a41249153c568f5182fdf11b1d275eba451f
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 20:10:48 2015 +1000

    FIXUP PersonProjectMemberships.java

commit ce2dc54a3d72b665b07eea3d9e646ac11795c341
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 20:07:02 2015 +1000

    refactor(HLocale): add note to change method names to be more standard.

    There are a bunch of methods named `retrieve...` rather than `get...`,
    which means they don't work with normal property syntax. There are normal
    getters, but they may return nothing because the fields are populated only
    in the `retireve` methods.
    This needs a bit of thought and attention to make it sensible so it does
    not waste developer time.

commit 777293aeda1a1524d60a62f2aaf8ec609bd5328b
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 28 19:58:41 2015 +1000

    feat(person-tile): add standard person tile

    Simple composite component with a gravatar image and username that link
    to a given person's profile page.

commit 87113ae6e8ee4e62b4d974a86f46f34fe6d6a279
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 24 14:09:23 2015 +1000

    Implement people list sorting and filtering

commit 3b8d240672e8441af3017f24376fbb9ea35505cd
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 23 16:52:51 2015 +1000

    WIP: add sorting

commit d726ec332effc0eb534f93933eecbecf436f2a18
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 23 16:16:48 2015 +1000

    WIP: modal dialog sets person properly.

     - need to hook up the rest of the parts (checkboxes etc.
     - need to get buttons combined into one
  Can use zanata.modal.show(selector) to show the dialog.
  Probably want it oncomplete so that it refreshes before showing,
  or maybe nest the ajax section inside the modal if it is possible
  for that to work well with the id. If so, the modal would need to
  be in loading state until the new data comes through.

commit b6ea9ab58b55b4926f558ea3a17230fee5159175
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 21 14:22:34 2015 +1000

    Add search and sorting for people's tab

commit e74837fe5f94805a4c32dce0c41b6c0e29f41e45
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jul 19 22:07:55 2015 +1000

    WIP: person membership modal

commit 50a7951c567095256ff1c297555dd2c263e6267d
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jul 19 22:06:57 2015 +1000

    WIP: backing class for project membership modal

commit 35729409ae9fbd26ac94e641e39f7d93e9cda159
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jul 19 20:53:10 2015 +1000

    feat(project-translation-teams): change project maintainer tab to people tab

commit a352ed0214de8031430163ebc1613a78a8af9791
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jul 19 21:33:47 2015 +1000

    feat(project-translation-teams): add permissions for project locale team members

    Allows project translators, reviewers and translation maintainers to perform their
    assigned roles in the project.

commit 7d65fba35f97906e6fe7d069335a0eca93a5981e
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jul 19 19:47:24 2015 +1000

    feat(project-translation-teams): add localeMembers to HProject

    Adds database table HProject_LocaleMember that maps to HProjectLocaleMember,
    containing a LocaleRole.

commit fe5c90f4969d05b598ce87314c68061413c1ebb6
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 13 14:08:56 2015 +1000

    refactor(jsf): match doctype to root element in project.xhtml

    A warning was generated by the IDE because the root element and doctype did not
    match. We have a mix of doctype "html" and "composition" for <ui:composition>
    templates and they seem to work with either, so it seems sensible to make them
    consistent by changing them all to the one that does not generate a warning.

commit 835d464ecb3bd6b345e5a9e5b8a3aa6efa446846
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 13 14:00:12 2015 +1000

    refactor(jsf): use absolute path for includes and templates

    This is more maintainable since the paths will now stay valid even if the
    file that uses the templates and includes moves to a different location.
    This frees us up to organize our JSF templates with less chance of breakages.

commit c2d64f6d8434c95ecb530ed8260c73746ea13d74
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 9 09:15:53 2015 +1000

    feat(project-translation-teams): use HProject_Member to record maintainer status

    Removes the old HProject_Maintainers table, since HProject_Member now records maintainer status.
    Permission checks are changed to use HQL queries in the new ProjectMemberDAO both because:
     - it is more efficient: executes a single query rather than loading an entire collection
     - it avoids issues trying to filter a lazy collection that has already been detached

commit ed5a770bbf189458ee8ccfe1f67928f34c974ec4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 2 12:08:29 2015 +1000

    feat(project-translation-teams): add HProject_Member table with data from HProject_Maintainer

    Copy data from HProject_Maintainer table but do not delete it yet.
    HProject_Maintainer should be removed once all code is migrated to use the new table.

commit 87f0ed914efee043a7ec47e3effa716b079baf63
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 1 17:10:22 2015 +1000

    feat(project-translation-teams): prevent global translation for projects that do not allow it

    Never grant translation access based on membership in global translation teams when the project
    does not allow global translation access. At this point only maintainers and admins can translate
    when global translation is not allowed. When other members can be added to the project team they
    will have additional security rules to grant access.

commit 36937ad2a98b6f7a6f62824550e15f8f2ce0127a
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 1 15:14:11 2015 +1000

    feat(project-translation-teams): add invite-only toggle to project translation settings

commit 3b136e21eba7d87663213c72dfb849bbe09aee9b
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jun 30 14:03:34 2015 +1000

    feat(project-translation-teams): add allowGlobalTranslation field to HProject

    Prepare for "Invite only" toggle in project settings.


  Commit: 6cb9529b162cb987e83b24d700d14f7fed656ee3
      https://github.com/zanata/zanata-server/commit/6cb9529b162cb987e83b24d700d14f7fed656ee3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/client/client.md
    M docs/user-guide/documents/download-translated-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/upload-glossaries.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-types.md
    M docs/user-guide/versions/create-version.md

  Log Message:
  -----------
  Change client doc links to use docs.zanata.org

Also fix broken links to old Installation page


  Commit: 2b834ef14b3f447a7a62d0abb4f1be165278b334
      https://github.com/zanata/zanata-server/commit/2b834ef14b3f447a7a62d0abb4f1be165278b334
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Replace bugzilla links with zanata.atlassian.net


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

  Changed paths:
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/client/client.md
    M docs/user-guide/documents/download-translated-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/upload-glossaries.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-types.md
    M docs/user-guide/versions/create-version.md

  Log Message:
  -----------
  Merge pull request #968 from zanata/update-client-doc-links

Change client doc links to use docs.zanata.org


  Commit: 525abe15165e6c14057c351fb6f082f81385b069
      https://github.com/zanata/zanata-server/commit/525abe15165e6c14057c351fb6f082f81385b069
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M .travis.yml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java

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


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

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/ZNTA-674-rich-namespace' into integration/master


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

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java

  Log Message:
  -----------
  refactor: convert some iterations to use Java 1.8 streams


  Commit: 3d7e55de3a9470103daef021aabb48df915837ff
      https://github.com/zanata/zanata-server/commit/3d7e55de3a9470103daef021aabb48df915837ff
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  docs: mention Java 1.8 requirement


  Commit: 6d06105e5059b0af9cd79849f9376bf058c48ec7
      https://github.com/zanata/zanata-server/commit/6d06105e5059b0af9cd79849f9376bf058c48ec7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  test: stabilize functional test by using RuleChain


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

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.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/RevertTransUnitUpdatesHandlerTest.java

  Log Message:
  -----------
  Merge pull request #956 from zanata/fix-npe-resourceutils

test: fix NPEs where ResourceUtils is used


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

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-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/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/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/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  replace all s:link with h:link


  Commit: 8afcd2d307dfab7bb6697bc2689e42fa3a8da49d
      https://github.com/zanata/zanata-server/commit/8afcd2d307dfab7bb6697bc2689e42fa3a8da49d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  replace s:selectItem with c:selectItem


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    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/server_configuration.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/edit_home_content.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml

  Log Message:
  -----------
  replace s:button with h:button


  Commit: 288bcb22c6d9de3e24d88a0a32a7b699827808c2
      https://github.com/zanata/zanata-server/commit/288bcb22c6d9de3e24d88a0a32a7b699827808c2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.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/language/language.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  replace s:span with either span or h:panelGroup


  Commit: 92ebe1d0717a70c5bb07a617254c0265684c6e1d
      https://github.com/zanata/zanata-server/commit/92ebe1d0717a70c5bb07a617254c0265684c6e1d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M 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/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M 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/layout/version/zip_download_progress_modal.xhtml
    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/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.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
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.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/dashboard/home.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.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/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.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

  Log Message:
  -----------
  replace s:fragment with ui:fragment


  Commit: 6972e760d293f1789f6bf1549708b9de73b15503
      https://github.com/zanata/zanata-server/commit/6972e760d293f1789f6bf1549708b9de73b15503
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  remove unused jsf page


  Commit: 92f842f180e6d675b643166561d2d30dbf758ee8
      https://github.com/zanata/zanata-server/commit/92f842f180e6d675b643166561d2d30dbf758ee8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M 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/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/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-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/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M 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/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.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
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/glossary/view.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/profile/create_user.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-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

  Log Message:
  -----------
  replace s:div with h:panelGroup


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  replace s:fileUpload with rich:fileUpload


  Commit: 9fed6b86fa7fd4d32d2e5b1fca68e6dde14a05da
      https://github.com/zanata/zanata-server/commit/9fed6b86fa7fd4d32d2e5b1fca68e6dde14a05da
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M functional-test/pom.xml
    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/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.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/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    A zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
    A zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/field.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/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.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/register.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.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/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    A zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
    A zanata-war/src/main/webapp/resources/zanata/field.xhtml

  Log Message:
  -----------
  replace s:decorate with zanata:decorate


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
    A zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/edit_home_content.xhtml

  Log Message:
  -----------
  fix according to review


  Commit: 9b9113091150579237bb863b5d6ec50557176a4f
      https://github.com/zanata/zanata-server/commit/9b9113091150579237bb863b5d6ec50557176a4f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge pull request #969 from zanata/update-bug-links

Replace bugzilla links with zanata.atlassian.net


  Commit: aebaf6e7c15df6f0bb6d48a4215b26ad9014453c
      https://github.com/zanata/zanata-server/commit/aebaf6e7c15df6f0bb6d48a4215b26ad9014453c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge commit '9b9113091150579237bb863b5d6ec50557176a4f' into HEAD


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #972 from zanata/java18runtime

docs: mention Java 1.8 requirement


  Commit: 4ba64f03be36d86fee7e5b2b23fda8014c1e3a55
      https://github.com/zanata/zanata-server/commit/4ba64f03be36d86fee7e5b2b23fda8014c1e3a55
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #973 from zanata/rulechain-SecurityTest

test: stabilize functional test by using RuleChain


  Commit: 59e8e68314488193576cbc2a85c59a9a0c74dbe7
      https://github.com/zanata/zanata-server/commit/59e8e68314488193576cbc2a85c59a9a0c74dbe7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

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

  Log Message:
  -----------
  Merge commit '4ba64f03be36d86fee7e5b2b23fda8014c1e3a55' into HEAD


  Commit: 07633a381606bb1990b0d7ab1ac33cd824c5a636
      https://github.com/zanata/zanata-server/commit/07633a381606bb1990b0d7ab1ac33cd824c5a636
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/display.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
    M 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/project/languages-list.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-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/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.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_nobanner.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.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/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  remove unused refs to seam taglib


  Commit: 8384ac29f1daab0406af884fd532706c4621d055
      https://github.com/zanata/zanata-server/commit/8384ac29f1daab0406af884fd532706c4621d055
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

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

  Log Message:
  -----------
  ZNTA-686 fix(editor) - fix date validator pattern


  Commit: 360dec2d641db18927c3a06cdec2cfac997d8e71
      https://github.com/zanata/zanata-server/commit/360dec2d641db18927c3a06cdec2cfac997d8e71
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.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/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/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/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/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/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.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/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/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/EditVersionSlugTest.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/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/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/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java

  Log Message:
  -----------
  fix(test): Use RuleChain to operate rules sequentially


  Commit: 06698b3dd985a3bbf1b8ba01177319bb72241cf9
      https://github.com/zanata/zanata-server/commit/06698b3dd985a3bbf1b8ba01177319bb72241cf9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

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

  Log Message:
  -----------
  chore: rpm now Requires: java >= 1:1.8


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore: update Cobertura for Java 1.8


  Commit: 05f5b7fb47ff313e011ebe4a907ce1a49df3d354
      https://github.com/zanata/zanata-server/commit/05f5b7fb47ff313e011ebe4a907ce1a49df3d354
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.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/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/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/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/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/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.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/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/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/EditVersionSlugTest.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/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/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/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java

  Log Message:
  -----------
  Merge pull request #970 from zanata/use-rulechain

fix(test): Use RuleChain to operate rules sequentially


  Commit: 8b2f3780dfacca47c96b5d0871b0d197c19629da
      https://github.com/zanata/zanata-server/commit/8b2f3780dfacca47c96b5d0871b0d197c19629da
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.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/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/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/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/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/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.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/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/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/EditVersionSlugTest.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/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/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/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge branch 'master' into replace-seam-taglib

Conflicts:
	functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java


  Commit: 57dc54fbf6bcb9f2ea5d36e33b08d73b5155ebee
      https://github.com/zanata/zanata-server/commit/57dc54fbf6bcb9f2ea5d36e33b08d73b5155ebee
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore: disable animal-sniffer-maven-plugin for Java 1.8


  Commit: 891b5db8fca86f1e9f8d6354eb6f7cce967622e5
      https://github.com/zanata/zanata-server/commit/891b5db8fca86f1e9f8d6354eb6f7cce967622e5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  fix(jsf) - class should be styleClass in h:panelGroup


  Commit: f2cca68b1a9c796507708595a387551a7605fab1
      https://github.com/zanata/zanata-server/commit/f2cca68b1a9c796507708595a387551a7605fab1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  disable upload button when user clear upload file


  Commit: def7eab34e8d1bf146fab9163e486115591abc57
      https://github.com/zanata/zanata-server/commit/def7eab34e8d1bf146fab9163e486115591abc57
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    M frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js

  Log Message:
  -----------
  fix: add loader to user profile page

Squashed commit of the following:

commit f643afe0006984a08cb604662a61fa880a304562
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 24 09:08:09 2015 +1000

    fix: Loader not updating properly after data load

commit 2c1290db1b1a1b944feb71ac609a55a53ae83494
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Sep 21 14:49:31 2015 +1000

    fix: add loader to user profile page

    Loader is added when the page is loading data so as to not show a blank page.


  Commit: 6afc04b8f45c1b83e2cf1ac33af6bb7748faf4c6
      https://github.com/zanata/zanata-server/commit/6afc04b8f45c1b83e2cf1ac33af6bb7748faf4c6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    M frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js

  Log Message:
  -----------
  Merge commit 'def7eab34e8d1bf146fab9163e486115591abc57' into HEAD


  Commit: 47993991609b22f4574a2378be4d8a38179fca91
      https://github.com/zanata/zanata-server/commit/47993991609b22f4574a2378be4d8a38179fca91
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    R zanata-war/src/main/groovy/org/zanata/adapter/TranslatableSeparator.groovy
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/TranslatableSeparator.java
    M zanata-war/src/test/groovy/org/zanata/adapter/TranslatableSeparatorTest.groovy

  Log Message:
  -----------
  refactor: convert TranslatableSeparator from Groovy to Java 1.8


  Commit: 12b288884afe6b5a4278d9cf7b072cae228a6769
      https://github.com/zanata/zanata-server/commit/12b288884afe6b5a4278d9cf7b072cae228a6769
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    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/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  ZNTA-650 refactor - admin edit user/role doesn't need to use conversation scope


  Commit: 0de434b5eba4f53a40e09aefdf3b9146da9be747
      https://github.com/zanata/zanata-server/commit/0de434b5eba4f53a40e09aefdf3b9146da9be747
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

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

  Log Message:
  -----------
  Make it clear that 'true' and 'false' are literals


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

  Changed paths:
    R zanata-war/src/main/webapp/resources/zanata/text-search.xhtml

  Log Message:
  -----------
  Merge pull request #964 from zanata/delete-obsolete-composite

refactor: delete obsolete composite text-search


  Commit: 98ec9d08562881f18ac192e566f29b1d284a8a12
      https://github.com/zanata/zanata-server/commit/98ec9d08562881f18ac192e566f29b1d284a8a12
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #979 from zanata/literal-true-false

Make it clear that 'true' and 'false' are literals


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

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql

  Log Message:
  -----------
  Add any missing foreign keys

In the past, some Zanata environments defaulted to MyISAM for new
tables, and so some tables were MyISAM when we tried to create various
foreign keys. (MySQL silently ignores ADD FOREIGN KEY for MyISAM
tables.) This commit ensures that the affected foreign keys are
created if they don't exist.


  Commit: 72208c1fffaa52ec883a86a7cf9484c286d136d7
      https://github.com/zanata/zanata-server/commit/72208c1fffaa52ec883a86a7cf9484c286d136d7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rename method names


  Commit: 5cbc534b8228c8c5c6d926d3def77dee6fe133e7
      https://github.com/zanata/zanata-server/commit/5cbc534b8228c8c5c6d926d3def77dee6fe133e7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M functional-test/pom.xml
    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/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.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/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
    A zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
    A zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.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/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_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
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M 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/layout/version/upload_translation_modal.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/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/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/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
    A zanata-war/src/main/webapp/resources/zanata/field.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #928 from zanata/replace-seam-taglib

Replace seam taglib


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/email_validation.xhtml
    M zanata-war/src/main/webapp/account/klogin.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/register.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/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  ZNTA-650 refactor(pages.xml) - move action and param to jsf pages


  Commit: 05bf8ee72d9b802df15cf5b8692c4714ef7dbd2d
      https://github.com/zanata/zanata-server/commit/05bf8ee72d9b802df15cf5b8692c4714ef7dbd2d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  move admin pages security check from pages.xml to all pages


  Commit: 560c5749cba63ef6684d34351339f7f784718cde
      https://github.com/zanata/zanata-server/commit/560c5749cba63ef6684d34351339f7f784718cde
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/servlet/CacheControlFilter.java
    M zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  refactor - migrate seam pages.xml cache header control to servlet filter


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

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/mysql/add_missing_fks.sql

  Log Message:
  -----------
  Use stored proc for MySQL 5.x compatibility


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

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

  Log Message:
  -----------
  Merge pull request #974 from zanata/ZNTA-686-editor-filter

ZNTA-686 fix(editor) - fix date validator pattern


  Commit: d10c4c66f3bdc5934eca7785e092c7856d195851
      https://github.com/zanata/zanata-server/commit/d10c4c66f3bdc5934eca7785e092c7856d195851
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

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

  Log Message:
  -----------
  Merge commit 'e3f55cd1bed1986ee2ed7c2752b9430b273b60e5' into HEAD


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

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml
    R zanata-war/src/main/groovy/org/zanata/adapter/TranslatableSeparator.groovy
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/TranslatableSeparator.java
    M zanata-war/src/test/groovy/org/zanata/adapter/TranslatableSeparatorTest.groovy

  Log Message:
  -----------
  Merge pull request #971 from zanata/java18

enable Java 1.8 for compilation


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

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  chore: add option to test against lowercase mysql


  Commit: 0b0774e03692b6e34d6864ffa759832cf1125469
      https://github.com/zanata/zanata-server/commit/0b0774e03692b6e34d6864ffa759832cf1125469
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  chore: disable Java 1.7 builds on Travis


  Commit: f6779595e9c957acfe123719beb33ce3a14e2192
      https://github.com/zanata/zanata-server/commit/f6779595e9c957acfe123719beb33ce3a14e2192
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserSearch.java
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml

  Log Message:
  -----------
  ZNTA-704 remove seam @DataModel and @DataModelSelection


  Commit: 841c2fe0c41456d1934c0ea2da4c4d4f90b4359c
      https://github.com/zanata/zanata-server/commit/841c2fe0c41456d1934c0ea2da4c4d4f90b4359c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/exception/LockTimeoutException.java
    A zanata-war/src/main/java/org/zanata/util/SynchronizationInterceptor.java
    A zanata-war/src/main/java/org/zanata/util/Synchronized.java
    M zanata-war/src/main/java/org/zanata/util/SysProperties.java
    A zanata-war/src/test/java/org/zanata/util/SynchronizationTest.java
    A zanata-war/src/test/resources/META-INF/beans.xml

  Log Message:
  -----------
  implement SynchronizationInterceptor for CDI


  Commit: a52e4f3cfb009ee9847909d4ac00f6260bf2a6d7
      https://github.com/zanata/zanata-server/commit/a52e4f3cfb009ee9847909d4ac00f6260bf2a6d7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add cdi-unit dependency


  Commit: 9c32fe57cf14aadd1c2219d497664d628f0c2778
      https://github.com/zanata/zanata-server/commit/9c32fe57cf14aadd1c2219d497664d628f0c2778
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/SynchronizationInterceptor.java
    M zanata-war/src/main/java/org/zanata/util/Synchronized.java
    M zanata-war/src/test/java/org/zanata/util/SynchronizationTest.java
    A zanata-war/walkmod.xml

  Log Message:
  -----------
  Remove support for @Synchronized methods

If only part of an object's state needs synchronisation, it should
probably be split up.


  Commit: 75e8091636ea1105ca53a64aedfe836b5cfd7665
      https://github.com/zanata/zanata-server/commit/75e8091636ea1105ca53a64aedfe836b5cfd7665
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    M zanata-war/src/main/java/org/zanata/seam/framework/Home.java

  Log Message:
  -----------
  ZNTA-713 delete unused methods


  Commit: 2fc5d853878651f5e634b9b0c5a0213aef4663f6
      https://github.com/zanata/zanata-server/commit/2fc5d853878651f5e634b9b0c5a0213aef4663f6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    M zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    M zanata-war/src/main/java/org/zanata/seam/framework/Home.java

  Log Message:
  -----------
  ZNTA-713 remove seam StatusMessage and unused event publishing


  Commit: 345600dd0847a8ce6c94ac0a6d2dd81fd95a54a6
      https://github.com/zanata/zanata-server/commit/345600dd0847a8ce6c94ac0a6d2dd81fd95a54a6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Home.java

  Log Message:
  -----------
  ZNTA-713 remove unused seam ValueExpression reference


  Commit: 77723bd1be177c7ca22cf7e508d260d2c1866a1a
      https://github.com/zanata/zanata-server/commit/77723bd1be177c7ca22cf7e508d260d2c1866a1a
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    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/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  adjust markup and function calls for scrollable panels

The other part of the fix is in zanata-assets:
https://github.com/zanata/zanata-assets/commit/7079cddc066216c3e28ea977322e566bf98c5ddc


  Commit: 8016d62439dd64979e43f3f1a5a2229df9d11e05
      https://github.com/zanata/zanata-server/commit/8016d62439dd64979e43f3f1a5a2229df9d11e05
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    M zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    M zanata-war/src/main/java/org/zanata/seam/framework/MutableController.java
    R zanata-war/src/main/java/org/zanata/seam/framework/PersistenceController.java

  Log Message:
  -----------
  ZNTA-713 - replace Seam persistence context provider and transaction


  Commit: ab8df41e7cd123e6cc05d942c493ef8541f6d051
      https://github.com/zanata/zanata-server/commit/ab8df41e7cd123e6cc05d942c493ef8541f6d051
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Home.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  ZNTA-713 - replace Seam EntityNotFoundException


  Commit: 127e263544d8b062c08bf1e79d5401279f86bb54
      https://github.com/zanata/zanata-server/commit/127e263544d8b062c08bf1e79d5401279f86bb54
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java

  Log Message:
  -----------
  (fix)User API: fix permission for user information api

https://zanata.atlassian.net/browse/ZNTA-696


  Commit: 383096aabd20c55ad8b2bf42d5dfaf8d2f8262f1
      https://github.com/zanata/zanata-server/commit/383096aabd20c55ad8b2bf42d5dfaf8d2f8262f1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  (fix)account activation: message not display

https://zanata.atlassian.net/browse/ZNTA-9


  Commit: 7222321ea38c15aa4956572b91cb68f2317f189f
      https://github.com/zanata/zanata-server/commit/7222321ea38c15aa4956572b91cb68f2317f189f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java

  Log Message:
  -----------
  Merge pull request #987 from zanata/ZNTA-696

Fix required false for authenticated user


  Commit: 5716c4c7a2f88efa8179b4b4c7cd4d21480078d6
      https://github.com/zanata/zanata-server/commit/5716c4c7a2f88efa8179b4b4c7cd4d21480078d6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-9-activation-message


  Commit: 8d8550fd3615f55afcc0c18b3c389176abb4742a
      https://github.com/zanata/zanata-server/commit/8d8550fd3615f55afcc0c18b3c389176abb4742a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Merge pull request #993 from zanata/ZNTA-9-activation-message

Fix account activation message not display


  Commit: 39398e92dd1dd16dfdb2d254f36fb1249579e107
      https://github.com/zanata/zanata-server/commit/39398e92dd1dd16dfdb2d254f36fb1249579e107
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/util/PasswordUtil.java
    A zanata-war/src/test/java/org/zanata/util/PasswordUtilTest.java

  Log Message:
  -----------
  ZNTA-704 refactor replace seam hash util


  Commit: 1ebba265958baf3d7420cef475f16a0f1b7fdb0b
      https://github.com/zanata/zanata-server/commit/1ebba265958baf3d7420cef475f16a0f1b7fdb0b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    R zanata-war/walkmod.xml

  Log Message:
  -----------
  Remove walkmod.xml


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

  Changed paths:
    R zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/transaction/TransactionUtil.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/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java

  Log Message:
  -----------
  refactor: Remove usages of Seam's Work class

Turned the seam class into a functional utility.
This revision still performs the same code as the Seam Work class.


  Commit: 3f3ad50f9a82a9bb4691e722300f4fccd10d456e
      https://github.com/zanata/zanata-server/commit/3f3ad50f9a82a9bb4691e722300f4fccd10d456e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
    A zanata-war/src/main/java/org/zanata/events/LocaleSelectedEvent.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  ZNTA-704 refactor replace seam locale selector


  Commit: 037a07fd0021d25ff11a4553ad44ae55a46d71fc
      https://github.com/zanata/zanata-server/commit/037a07fd0021d25ff11a4553ad44ae55a46d71fc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  ZNTA-704 replace seam FileUploadException


  Commit: 55c9aaf6d3bf6f748afa4d9d2f6c0088a6e14562
      https://github.com/zanata/zanata-server/commit/55c9aaf6d3bf6f748afa4d9d2f6c0088a6e14562
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java

  Log Message:
  -----------
  ZNTA-704 - replace seam FacesMessages usage


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

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

  Log Message:
  -----------
  Fix copy trans run in separate transaction

Passing functions around might not work in every case considering Seam
"uninjects" all beans after exiting method calls.


  Commit: 0103aabe009da4071ee4ece3d5df1e02984858bd
      https://github.com/zanata/zanata-server/commit/0103aabe009da4071ee4ece3d5df1e02984858bd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

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

  Log Message:
  -----------
  Fix text comparison


  Commit: 52c9c40ed863c9b4ca36728ffea0be159c8e3f91
      https://github.com/zanata/zanata-server/commit/52c9c40ed863c9b4ca36728ffea0be159c8e3f91
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  (fix)Signup page: increase password length to 1024

https://zanata.atlassian.net/browse/ZNTA-624

Squashed commit of the following:

commit 45d6d815f8f88d7d519c8e5cbea658ab5ffab2a6
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 2 09:32:30 2015 +1000

    fix functional test

commit 9f43b05a3547134f690f47e2c0ef24b013b1bb94
Merge: ff98105 8d8550f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 2 08:04:40 2015 +1000

    Merge branch 'integration/master' into ZNTA-624

commit ff98105f97b6bbb67c6f567647a751f4a98fccd0
Merge: aca4869 7222321
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 2 06:38:19 2015 +1000

    Merge branch 'integration/master' into ZNTA-624

commit aca4869b7f82d423ba9848bfe304f6c828b1ac95
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 30 09:23:55 2015 +1000

    (fix)Signup page: increase password length to 1024

    https://zanata.atlassian.net/browse/ZNTA-624


  Commit: 54b2de4ca60d96143b14a21b31f73a25f5c0e068
      https://github.com/zanata/zanata-server/commit/54b2de4ca60d96143b14a21b31f73a25f5c0e068
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Use JVM's built-in JavaScript engine

Now that we require Java 1.8, this should pick up Nashorn (or perhaps its replacement, one day).


  Commit: e63567be09958d471eb255abd281a0ad6c860e44
      https://github.com/zanata/zanata-server/commit/e63567be09958d471eb255abd281a0ad6c860e44
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Reuse Nashorn bindings using ThreadLocals


  Commit: 8ce2fd04dee47cdd9d3b14445eaa8904dce0a462
      https://github.com/zanata/zanata-server/commit/8ce2fd04dee47cdd9d3b14445eaa8904dce0a462
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Reuse CompiledScript


  Commit: 3fd0a1180529348158cc829867612b702c7291d5
      https://github.com/zanata/zanata-server/commit/3fd0a1180529348158cc829867612b702c7291d5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Create 'window' binding at init time


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

  Changed paths:
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  chore: move zanatasearchindex under target dir in tests


  Commit: 1ddd6b054f4ca09dc92901a0c1bcc1147fc6583d
      https://github.com/zanata/zanata-server/commit/1ddd6b054f4ca09dc92901a0c1bcc1147fc6583d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

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

  Log Message:
  -----------
  ZNTA-704 - fix delete user error


  Commit: 46677bf03faf4c2aa870a33f2c509224624c87ac
      https://github.com/zanata/zanata-server/commit/46677bf03faf4c2aa870a33f2c509224624c87ac
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

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

  Log Message:
  -----------
  fix unit test compilation problem


  Commit: cbf0ee4d8a5c8ff27215847eca3e266ec101a825
      https://github.com/zanata/zanata-server/commit/cbf0ee4d8a5c8ff27215847eca3e266ec101a825
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    A zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/events/LocaleSelectedEvent.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/util/PasswordUtil.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    A zanata-war/src/test/java/org/zanata/util/PasswordUtilTest.java

  Log Message:
  -----------
  Merge pull request #982 from zanata/replace-seam

refactor - remove various Seam references


  Commit: 249b97d45a7c79dab83694a9e1035d9fd6a6a79b
      https://github.com/zanata/zanata-server/commit/249b97d45a7c79dab83694a9e1035d9fd6a6a79b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/servlet/CacheControlFilter.java
    M zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    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/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/email_validation.xhtml
    M zanata-war/src/main/webapp/account/klogin.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/register.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #980 from zanata/ZNTA-650-pages-action

ZNTA-650 migrate action in pages.xml to jsf pages


  Commit: 5313a5f8800f6472f0408d5a16d5d4a3030d8ba3
      https://github.com/zanata/zanata-server/commit/5313a5f8800f6472f0408d5a16d5d4a3030d8ba3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    R zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/LogoutEvent.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  fix(ZNTA-634): increase session timeout

For authenticated users. Value is determined by components.xml
Session timeout gets increased after logging in, and reverts back after logging out.
The value set to authenticated sessions is the largest value between the
configured authenticated session timeout and the anonymous session
timeout.

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


  Commit: 7aee357cc906b7008a5afa86b7e6c68acbcc4da1
      https://github.com/zanata/zanata-server/commit/7aee357cc906b7008a5afa86b7e6c68acbcc4da1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Merge pull request #988 from zanata/mysql56-lowercase

chore: add option to test against lowercase mysql


  Commit: 3c299747749b77428e9904e8d79eb2429ce8b929
      https://github.com/zanata/zanata-server/commit/3c299747749b77428e9904e8d79eb2429ce8b929
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M functional-test/pom.xml

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


  Commit: 513f961efb8bdecf8fbe5e48352fe63cbf38e5e0
      https://github.com/zanata/zanata-server/commit/513f961efb8bdecf8fbe5e48352fe63cbf38e5e0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    M zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    M zanata-war/src/main/java/org/zanata/seam/framework/Home.java
    M zanata-war/src/main/java/org/zanata/seam/framework/MutableController.java
    R zanata-war/src/main/java/org/zanata/seam/framework/PersistenceController.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #992 from zanata/ZNTA713-entity-home

ZNTA-713 reduce Seam dependencies in entity home framework


  Commit: 1eb82379ef58f5b2b8f39cfe685edc96a7fee92e
      https://github.com/zanata/zanata-server/commit/1eb82379ef58f5b2b8f39cfe685edc96a7fee92e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

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

  Log Message:
  -----------
  Disable text entry post check in some conditions


  Commit: 3ec41a700bbf8b7bb537712e21d2806362842163
      https://github.com/zanata/zanata-server/commit/3ec41a700bbf8b7bb537712e21d2806362842163
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M 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/AsyncTaskManager.java

  Log Message:
  -----------
  refactor(async): java8 lambdas for async framework

and a little bit of documentation

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


  Commit: bce8bb8814239db018eb51278b170582375d2beb
      https://github.com/zanata/zanata-server/commit/bce8bb8814239db018eb51278b170582375d2beb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/exception/LockTimeoutException.java
    A zanata-war/src/main/java/org/zanata/util/SynchronizationInterceptor.java
    A zanata-war/src/main/java/org/zanata/util/Synchronized.java
    M zanata-war/src/main/java/org/zanata/util/SysProperties.java
    A zanata-war/src/test/java/org/zanata/util/SynchronizationTest.java
    A zanata-war/src/test/resources/META-INF/beans.xml

  Log Message:
  -----------
  Merge pull request #991 from zanata/synchinterceptor

Add CDI interceptor for Synchronized


  Commit: ae24fc40d108194c1140352928c2711af298fe5e
      https://github.com/zanata/zanata-server/commit/ae24fc40d108194c1140352928c2711af298fe5e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #998 from zanata/fix-text-comparison

Fix text comparison


  Commit: 770b77c28646a4e4e3d41056cb572243cc16da4d
      https://github.com/zanata/zanata-server/commit/770b77c28646a4e4e3d41056cb572243cc16da4d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

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

  Log Message:
  -----------
  fix: url for documents with paths

Currently the navigation to the version page, Document tab, to a
specific document is broken (when entering the url provided by Zanata
directly on the browser bar the server returns a 404). This commit
should fix that problem.


  Commit: 4482af1dc34e46ee2778aa7f8b8ccaffafe5d8c3
      https://github.com/zanata/zanata-server/commit/4482af1dc34e46ee2778aa7f8b8ccaffafe5d8c3
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/transaction/TransactionUtil.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/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java

  Log Message:
  -----------
  Merge pull request #997 from zanata/remove-work-usages

refactor: Remove usages of Seam's Work class


  Commit: 15170fcc1757a0e4847c9d7be7d80ece50facd78
      https://github.com/zanata/zanata-server/commit/15170fcc1757a0e4847c9d7be7d80ece50facd78
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  test: bind SMTP server to localhost only


  Commit: 860f80e6b216571b850853fc783cbd4c17fcad05
      https://github.com/zanata/zanata-server/commit/860f80e6b216571b850853fc783cbd4c17fcad05
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M etc/scripts/allocate-ports

  Log Message:
  -----------
  test: get random ports for all interfaces


  Commit: f606c535cfd9424897aa4b829228998dd7d888a8
      https://github.com/zanata/zanata-server/commit/f606c535cfd9424897aa4b829228998dd7d888a8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M etc/scripts/allocate-ports
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Merge pull request #1003 from zanata/smtp-localhost

change allocation of ports in tests


  Commit: 6419ac2c44d8645306111cf3b87430414d669518
      https://github.com/zanata/zanata-server/commit/6419ac2c44d8645306111cf3b87430414d669518
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M etc/scripts/allocate-ports
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Merge commit 'f606c535cfd9424897aa4b829228998dd7d888a8' into HEAD


  Commit: 728fa38f01aceeb149de342c1441d7a75fe0c792
      https://github.com/zanata/zanata-server/commit/728fa38f01aceeb149de342c1441d7a75fe0c792
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  test: bind EAP to localhost only


  Commit: 4460c1f3a65944a8b6a35cf131e266c224c6cd75
      https://github.com/zanata/zanata-server/commit/4460c1f3a65944a8b6a35cf131e266c224c6cd75
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1004 from zanata/jboss-localhost

test: bind EAP to localhost only


  Commit: 8fe99a0a355b46ca30ea8f18bf4ab33397baac8b
      https://github.com/zanata/zanata-server/commit/8fe99a0a355b46ca30ea8f18bf4ab33397baac8b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  Merge commit '4460c1f3a65944a8b6a35cf131e266c224c6cd75' into HEAD


  Commit: 3da60f8dde76288553aae57d106c5da441861953
      https://github.com/zanata/zanata-server/commit/3da60f8dde76288553aae57d106c5da441861953
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #960 from zanata/adjust-jdk-tools-version

chore: use JVM version for tools jar


  Commit: e24ad1c19e9590c6e96658b6c143f3b729870ab2
      https://github.com/zanata/zanata-server/commit/e24ad1c19e9590c6e96658b6c143f3b729870ab2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/Repeat.java
    A zanata-war/src/test/java/org/zanata/util/RepeatRule.java

  Log Message:
  -----------
  Eval JS script once only per thread


  Commit: 92cc633494db3d6fdc063bcb80f1f87b083c10b0
      https://github.com/zanata/zanata-server/commit/92cc633494db3d6fdc063bcb80f1f87b083c10b0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

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

  Log Message:
  -----------
  feat(search): Add more checks for bad TM results


  Commit: 75ecbaefed46b66e3da7de4d308b5e9a57e8033a
      https://github.com/zanata/zanata-server/commit/75ecbaefed46b66e3da7de4d308b5e9a57e8033a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java

  Log Message:
  -----------
  feat(search): avoid tokenising non-text fields


  Commit: 0f931e6c28576528ece1379e1680f491a90f85dd
      https://github.com/zanata/zanata-server/commit/0f931e6c28576528ece1379e1680f491a90f85dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge pull request #1000 from zanata/move-zanatasearchindex

chore: move zanatasearchindex under target dir in tests


  Commit: 0edb617b156631520eee02fe92511ebbe7a2cf24
      https://github.com/zanata/zanata-server/commit/0edb617b156631520eee02fe92511ebbe7a2cf24
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java

  Log Message:
  -----------
  Add comment


  Commit: 1e7e7e8f9c231298591d168dc3c8ddc5ea160e84
      https://github.com/zanata/zanata-server/commit/1e7e7e8f9c231298591d168dc3c8ddc5ea160e84
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-721): pre-sort TM by Lucene score


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

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

  Log Message:
  -----------
  test: clean documents dir between tests


  Commit: 4183cafceb0df7a03dca3c916fb109789ca1970d
      https://github.com/zanata/zanata-server/commit/4183cafceb0df7a03dca3c916fb109789ca1970d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  fix(merge translation):allow admin to merge from all active projects

https://zanata.atlassian.net/browse/ZNTA-718


  Commit: ddb1cf69bbdd95c36c3f83da4197677fb81bb873
      https://github.com/zanata/zanata-server/commit/ddb1cf69bbdd95c36c3f83da4197677fb81bb873
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-10-14 (Wed, 14 Oct 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/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

  Log Message:
  -----------
  refactor: update zanata-spa to commit 68a0859e97288ab494b5e01af6d06db2d8cd0dfa

This version has the header using React instead of Angular, but functionality
is not changed.


  Commit: b6819e775ff18c7deba08acdf8725f01bff7df18
      https://github.com/zanata/zanata-server/commit/b6819e775ff18c7deba08acdf8725f01bff7df18
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge commit '910115a516ca130f504f7a209181d830739a0fcd' into HEAD


  Commit: 910115a516ca130f504f7a209181d830739a0fcd
      https://github.com/zanata/zanata-server/commit/910115a516ca130f504f7a209181d830739a0fcd
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release-notes): Add section 3.7.3


  Commit: 051478556ab3dc62332335cd6d8c8b473f0beee7
      https://github.com/zanata/zanata-server/commit/051478556ab3dc62332335cd6d8c8b473f0beee7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1006 from zanata/ZNTA-721-presort-tm-by-score

fix(ZNTA-721): pre-sort TM by Lucene score


  Commit: a1c2d3bfc4098d891341db9c8a451daca8b2d3a6
      https://github.com/zanata/zanata-server/commit/a1c2d3bfc4098d891341db9c8a451daca8b2d3a6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java

  Log Message:
  -----------
  Merge commit '051478556ab3dc62332335cd6d8c8b473f0beee7' into HEAD


  Commit: cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a
      https://github.com/zanata/zanata-server/commit/cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add ZNTA-721 to release notes


  Commit: 47143bfa0ae810f769bb8d0a34937bfd244d3b76
      https://github.com/zanata/zanata-server/commit/47143bfa0ae810f769bb8d0a34937bfd244d3b76
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge commit 'cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a' into HEAD


  Commit: 779fbb5ea8e3358ba4b3b3f9c347ab44ca4c4f6c
      https://github.com/zanata/zanata-server/commit/779fbb5ea8e3358ba4b3b3f9c347ab44ca4c4f6c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

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

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


  Commit: acd89f9b6bfe444655d3e18bdffe785bc5176018
      https://github.com/zanata/zanata-server/commit/acd89f9b6bfe444655d3e18bdffe785bc5176018
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

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

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


  Commit: e4dfd91ed2f10d8148c853495a1d5f90e05f8cc1
      https://github.com/zanata/zanata-server/commit/e4dfd91ed2f10d8148c853495a1d5f90e05f8cc1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

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


  Commit: fd91c6d68ce13d34bd34502e8057ff1f86525409
      https://github.com/zanata/zanata-server/commit/fd91c6d68ce13d34bd34502e8057ff1f86525409
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java

  Log Message:
  -----------
  fix(test): Replace return this with return new Page

Return this is page functions bypasses the AbstractPage waits/checks.


  Commit: 1f826e497a29e37b122d36e23c24b5a62404a988
      https://github.com/zanata/zanata-server/commit/1f826e497a29e37b122d36e23c24b5a62404a988
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-10-19 (Mon, 19 Oct 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/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

  Log Message:
  -----------
  Merge pull request #1013 from zanata/update-spa-znta-71

refactor: update zanata-spa to commit 68a0859e97288ab494b5e01af6d06db2d8cd0dfa


  Commit: adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
      https://github.com/zanata/zanata-server/commit/adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  Merge pull request #1009 from zanata/ZTA-718

fix(merge translation):allow admin/maintainer to merge from all active projects


  Commit: d7b6e915a41c5d79afb71896a952a228d523acaa
      https://github.com/zanata/zanata-server/commit/d7b6e915a41c5d79afb71896a952a228d523acaa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  exclude jersey dependency from zanata-api


  Commit: 910cb8ae62a3c598b90ea5efad2668472f8929d4
      https://github.com/zanata/zanata-server/commit/910cb8ae62a3c598b90ea5efad2668472f8929d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

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

  Log Message:
  -----------
  put back resteasy @Wrapped annotation for jaxb response


  Commit: e47782034f2196fdb8e178122a80ed88d4a2cc9b
      https://github.com/zanata/zanata-server/commit/e47782034f2196fdb8e178122a80ed88d4a2cc9b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1015 from zanata/fix-jersey-dependency

exclude jersey dependency from zanata-api


  Commit: 6f4847bffc9f3e49de455391c9e6856be27bb1f6
      https://github.com/zanata/zanata-server/commit/6f4847bffc9f3e49de455391c9e6856be27bb1f6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java

  Log Message:
  -----------
  Merge pull request #1014 from zanata/fix-join-language-team-test

fix(test): Replace return this with return new Page


  Commit: 5e7e898f89f42cc6d225f0196c1a88f6313daa5d
      https://github.com/zanata/zanata-server/commit/5e7e898f89f42cc6d225f0196c1a88f6313daa5d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M pom.xml

  Log Message:
  -----------
  Rerun flaky tests with Failsafe 2.19


  Commit: 3597a60e63c8983ded6fd06ca26ab4e1542ac94e
      https://github.com/zanata/zanata-server/commit/3597a60e63c8983ded6fd06ca26ab4e1542ac94e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1008 from zanata/fix-openoffice-test

test: clean documents dir between tests


  Commit: 127edfeebd7b4bcce519a596c2a1988d3930d323
      https://github.com/zanata/zanata-server/commit/127edfeebd7b4bcce519a596c2a1988d3930d323
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #967 from zanata/exclude-hibernate-search

Exclude Hibernate Search module


  Commit: b82af6f025267ecbef8cb844ab56b4758f3d747c
      https://github.com/zanata/zanata-server/commit/b82af6f025267ecbef8cb844ab56b4758f3d747c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

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

  Log Message:
  -----------
  Fix lock message at startup


  Commit: 0eefe29e733e7c62f2bbf7f9740e642768748f4b
      https://github.com/zanata/zanata-server/commit/0eefe29e733e7c62f2bbf7f9740e642768748f4b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M zanata-war/pom.xml

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


  Commit: c6b42e8c5809e059a02e0693151b4f7773228874
      https://github.com/zanata/zanata-server/commit/c6b42e8c5809e059a02e0693151b4f7773228874
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M zanata-war/pom.xml

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

Update classloader-leak-prevention to 1.15.1


  Commit: 0b002b277645c2dea9d61ba891cc3fb9b8e6dcf8
      https://github.com/zanata/zanata-server/commit/0b002b277645c2dea9d61ba891cc3fb9b8e6dcf8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1018 from zanata/fix-lock-message

Fix lock message at startup


  Commit: 97ce1663901fcba09ea9c74adcc9e89c6c51da6d
      https://github.com/zanata/zanata-server/commit/97ce1663901fcba09ea9c74adcc9e89c6c51da6d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1017 from zanata/failsafe219

Rerun flaky tests with Failsafe 2.19


  Commit: 12ca0a8d61cf098d3448fd47f1e0759bd2ccd6df
      https://github.com/zanata/zanata-server/commit/12ca0a8d61cf098d3448fd47f1e0759bd2ccd6df
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

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

  Log Message:
  -----------
  Upgrade to groovy 2.4.5


  Commit: afa3e1d49cd1f240e93ef3bc5f97675322b20304
      https://github.com/zanata/zanata-server/commit/afa3e1d49cd1f240e93ef3bc5f97675322b20304
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Use native Lucene locks for NFS safety


  Commit: 7322d60a58566980fd599d8192cfd554b54e8c88
      https://github.com/zanata/zanata-server/commit/7322d60a58566980fd599d8192cfd554b54e8c88
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1005 from zanata/fix-npe

Add more checks for bad/stale TM results


  Commit: 0d5f57320ad7a11da8f49f47c95aa42c727b1b90
      https://github.com/zanata/zanata-server/commit/0d5f57320ad7a11da8f49f47c95aa42c727b1b90
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java

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


  Commit: c57fee78443f17f66a0d78d9ebe08a2c3a0bb24c
      https://github.com/zanata/zanata-server/commit/c57fee78443f17f66a0d78d9ebe08a2c3a0bb24c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

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

  Log Message:
  -----------
  Work around path problem for JavaMelody

On some platforms, the MonitoringFilter has no init parameters
by the time requests come in, which causes JavaMelody to appear
under /monitoring instead of /admin/monitoring. This change uses
a servlet context parameter instead of a filter parameter.


  Commit: 7c87b489a6dcfe741bcec209cbf71d01212d88c2
      https://github.com/zanata/zanata-server/commit/7c87b489a6dcfe741bcec209cbf71d01212d88c2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  fix(merge translation):Translation merge targets the wrong source version

https://zanata.atlassian.net/browse/ZNTA-719

Squashed commit of the following:

commit d7d15cc50fc625d2d58cd46c626dd18fde2f0f77
Merge: d48dabd adb46eb
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 20 07:58:22 2015 +1000

    Merge branch 'integration/master' into ZTA-719

commit d48dabd75c4766408fbd25d1f74a3eafaff0edd5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 14 08:22:10 2015 +1000

    fix(merge translation):Translation merge targets the wrong source version

    https://zanata.atlassian.net/browse/ZNTA-719


  Commit: a5b8697671105418263a533aa91a5b6febc1c698
      https://github.com/zanata/zanata-server/commit/a5b8697671105418263a533aa91a5b6febc1c698
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1020 from zanata/groovy24

Upgrade to groovy 2.4.5


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

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    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/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #995 from zanata/ZNTA-115-scrolable-panels

adjust markup and function calls for scrollable panels


  Commit: 44f3fa294669c4676ef59a7252dba444d8976a81
      https://github.com/zanata/zanata-server/commit/44f3fa294669c4676ef59a7252dba444d8976a81
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql

  Log Message:
  -----------
  Merge pull request #983 from zanata/add-missing-fks

Add any missing foreign keys


  Commit: 3c910899f970fe9c2e031aaf8dc4caa270bb7bf9
      https://github.com/zanata/zanata-server/commit/3c910899f970fe9c2e031aaf8dc4caa270bb7bf9
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql

  Log Message:
  -----------
  Merge commit '44f3fa294669c4676ef59a7252dba444d8976a81' into HEAD


  Commit: ead75e479b38ac90272fdcf4b571286dc2fbf3b9
      https://github.com/zanata/zanata-server/commit/ead75e479b38ac90272fdcf4b571286dc2fbf3b9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 3.4.1


  Commit: 712debfdda2621d642585b484109c0cf01e97f32
      https://github.com/zanata/zanata-server/commit/712debfdda2621d642585b484109c0cf01e97f32
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

  Log Message:
  -----------
  Fix email message generated when user joining team


  Commit: 14a7d7ab6e9d9b308c0171f73e3ead9880fa2369
      https://github.com/zanata/zanata-server/commit/14a7d7ab6e9d9b308c0171f73e3ead9880fa2369
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge pull request #1021 from zanata/lucene-simple-locks

Use native Lucene locks for NFS safety


  Commit: 68b3783893693bfa216e10b43dced560ecd388c8
      https://github.com/zanata/zanata-server/commit/68b3783893693bfa216e10b43dced560ecd388c8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge commit '14a7d7ab6e9d9b308c0171f73e3ead9880fa2369' into HEAD


  Commit: 8793c9a005f23ed119eb6c6016f1222a961c60cd
      https://github.com/zanata/zanata-server/commit/8793c9a005f23ed119eb6c6016f1222a961c60cd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #1023 from zanata/fix-javamelody-path

Work around path problem for JavaMelody


  Commit: 6f9231bd43c197aafadd7292f60a308f45528072
      https://github.com/zanata/zanata-server/commit/6f9231bd43c197aafadd7292f60a308f45528072
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

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

  Log Message:
  -----------
  Merge commit '8793c9a005f23ed119eb6c6016f1222a961c60cd' into HEAD


  Commit: 2b0666c5f2b037ae6279e0b809f552067b475ff5
      https://github.com/zanata/zanata-server/commit/2b0666c5f2b037ae6279e0b809f552067b475ff5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

  Log Message:
  -----------
  Merge pull request #1026 from zanata/fix-email-message

Fix email message generated when user joining team


  Commit: 6613309dabb37ac8d188011eb653de16fec7fcd2
      https://github.com/zanata/zanata-server/commit/6613309dabb37ac8d188011eb653de16fec7fcd2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/Repeat.java
    A zanata-war/src/test/java/org/zanata/util/RepeatRule.java

  Log Message:
  -----------
  Merge pull request #999 from zanata/nashorn

Use Nashorn for CommonMark rendering


  Commit: e78f3e5c4748ae4e69112872dc9d5dfe09999c11
      https://github.com/zanata/zanata-server/commit/e78f3e5c4748ae4e69112872dc9d5dfe09999c11
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

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


  Commit: 66c9d2fcafdcd6f3e64baced7139618ac08faa03
      https://github.com/zanata/zanata-server/commit/66c9d2fcafdcd6f3e64baced7139618ac08faa03
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy

  Log Message:
  -----------
  chore(installer): minor changes to the installer script

Ask for confirmation before downloading zanata.war
Download war from github instead of sourceforge


  Commit: 51f9dd808664963aaa89a79169e9749c693317c4
      https://github.com/zanata/zanata-server/commit/51f9dd808664963aaa89a79169e9749c693317c4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1025 from zanata/ZNTA-705-liquibase34

Upgrade to Liquibase 3.4.1


  Commit: 4f26d4012e6823d8855e6e6de92a436c59cbe461
      https://github.com/zanata/zanata-server/commit/4f26d4012e6823d8855e6e6de92a436c59cbe461
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml

  Log Message:
  -----------
  fix(ZNTA-639): handle ViewExpiredException

Handle these type of exceptions both in ajax and non-ajax requests.
For ajax requests, inform the user and ask them to reload.
For non-ajax requests, inform the user and offer to head back to the
original page.

Squashed commit of the following:

commit 40dd9a42f3cb1d2ad9b0b7a4d7acf11d2011bba6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 1 12:07:30 2015 +1000

    fix(ZNTA-639): add issue to release notes

commit 84154310849fae87fdacd874ee157b09f0885152
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Sep 28 14:00:56 2015 +1000

    fix(ZNTA-639): disable transaction event listener

    Disable the listener that creates a JSF event whenever a transaction
    fails.

commit 51baf5654aae4e729bfe55818f3b1bf6f3cc6422
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Sep 28 13:27:35 2015 +1000

    fix(ZNTA-639): code review fixes

commit 66af8bf42217dd88cf024570d78be3ccbf347a31
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Sun Sep 27 15:30:43 2015 +1000

    fix(ZNTA-639): handle ViewExpiredException

    Handle these type of exceptions both in ajax and non-ajax requests.
    For ajax requests, inform the user and ask them to reload.
    For non-ajax requests, inform the user and offer to head back to the
    original page.


  Commit: f17949faafab8565531874f4a41715aa4871360d
      https://github.com/zanata/zanata-server/commit/f17949faafab8565531874f4a41715aa4871360d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy

  Log Message:
  -----------
  Merge pull request #1027 from zanata/installer-updates

chore(installer): minor changes to the installer script


  Commit: 0ab5b405818d16d94a78f2c1388a6f3e179a4d3a
      https://github.com/zanata/zanata-server/commit/0ab5b405818d16d94a78f2c1388a6f3e179a4d3a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    A docs/user-guide/system-admin/configuration/mac-installation.md
    M frontend/pom.xml
    A frontend/src/main/web/.gitignore
    A frontend/src/main/web/README.md
    A frontend/src/main/web/copy.sh
    A frontend/src/main/web/index.css
    A frontend/src/main/web/index.html
    A frontend/src/main/web/index.js
    A frontend/src/main/web/lib/actions/GlossaryActions.js
    A frontend/src/main/web/lib/actions/UserMatrixActions.js
    A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/lib/components/ContributionChart.jsx
    A frontend/src/main/web/lib/components/DayMatrix.jsx
    A frontend/src/main/web/lib/components/DropDown.jsx
    A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/lib/components/MessageModal.jsx
    A frontend/src/main/web/lib/components/RecentContributions.jsx
    A frontend/src/main/web/lib/components/RootContent.jsx
    A frontend/src/main/web/lib/components/SystemGlossary.jsx
    A frontend/src/main/web/lib/components/UserProfile.jsx
    A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    A frontend/src/main/web/lib/components/glossary/Comment.jsx
    A frontend/src/main/web/lib/components/glossary/DataTable.jsx
    A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    A frontend/src/main/web/lib/components/glossary/InputCell.jsx
    A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    A frontend/src/main/web/lib/constants/ActionTypes.js
    A frontend/src/main/web/lib/constants/Configs.js
    A frontend/src/main/web/lib/constants/Options.js
    A frontend/src/main/web/lib/constants/Views.js
    A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    A frontend/src/main/web/lib/stores/GlossaryStore.js
    A frontend/src/main/web/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/lib/stores/testData/glossary/entries.json
    A frontend/src/main/web/lib/stores/testData/glossary/info.json
    A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/lib/utils/DateHelper.js
    A frontend/src/main/web/lib/utils/GlossaryHelper.js
    A frontend/src/main/web/lib/utils/StringUtils.js
    A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/package.json
    A frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/server.js
    R frontend/src/main/web/user-profile-page/README.md
    R frontend/src/main/web/user-profile-page/copy.sh
    R frontend/src/main/web/user-profile-page/index.html
    R frontend/src/main/web/user-profile-page/index.js
    R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/web/user-profile-page/lib/constants/Options.js
    R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    R frontend/src/main/web/user-profile-page/package.json
    R frontend/src/main/web/user-profile-page/preprocessor.js
    R frontend/src/main/web/user-profile-page/server.js
    R frontend/src/main/web/user-profile-page/webpack.config.js
    R frontend/src/main/web/user-profile-page/webpack.prod.config.js
    A frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.prod.config.js
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    R 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/testharness/TestPlan.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    R zanata-model/src/main/java/org/zanata/model/HTermComment.java
    A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.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/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.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/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.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/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
    M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml

  Log Message:
  -----------
  Glossary management update

https://zanata.atlassian.net/browse/ZNTA-108

Squashed commit of the following:

commit 15d1640a0872ff150561f7d51ed787c175b446a6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 3 15:24:18 2015 +0900

    Fix unit test

commit d3fa0a4f72c9da3c32ee973660b01211052ae69b
Merge: adda6ed f17949f
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 3 14:42:15 2015 +0900

    Merge branch 'integration/master' into rhbz1245433-glossary

commit adda6ede3d1061566b3beca64338a5d414b9b056
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 23 10:52:46 2015 +1000

    Fix upload file notification

commit 88f86a2f205ab60639f68dc842d62cd7e6391c8a
Merge: 07c2977 127edfe
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 23 10:13:44 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit 07c2977ccf12fa455b08c679dc2d4a9c1a2903aa
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 22 16:10:34 2015 +1000

    Update notification model

commit 3f561211bb69dadb42464fcc4c9fc8276e6f05cb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 22 12:17:29 2015 +1000

    Update warning message when uploading file

commit 81148109017f80a5b4c00ee26166d53964a8aafc
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 21 20:42:23 2015 +1000

    Add warning message when duplicate entry

commit 2bd5898cef309f7df3388509e6706ac8486c1a4f
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Wed Oct 21 15:21:33 2015 +1000

    Remove webpack debug and read shrink-wrap

commit d6d71414776fce022113b9d1d659d29757402760
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Wed Oct 21 14:12:29 2015 +1000

    Ignore front-end build script

commit 3fa8fe30e8aae106cbe4bbb9146fd57ee7493cc1
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 21 14:38:23 2015 +1000

    Fix auto saving for glossary entry

commit bae5f9aa07d703b396ccb56130afbce9b22067df
Merge: e137199 6f4847b
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 21 11:20:58 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit e1371999db1e06c5e2c0839b24e0164294c3f884
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 20 14:41:49 2015 +1000

    Update zanata-ui

commit 4e353afa287c00bc73a8a8bc74526220621265a3
Merge: 40af402 e4dfd91
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Oct 19 08:26:17 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit 40af4026bef5dc7fd0c1c3e85df8db8f40438065
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 16 15:53:56 2015 +1000

    Add notification modal for message

commit 8653e88295e09a92380470d9de8f0b89ee9f0e23
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 15 17:47:03 2015 +1000

    More refactoring based on review comment

commit 9cb00d61df58b47c9273dfa3dcf5949f7e02ac80
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 15 16:22:19 2015 +1000

    Update glossary term lastModifiedBy

commit 72d3361457d49b7758b76c12828ffbe0904fc967
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 15 12:51:19 2015 +1000

    Update field name

commit 31375a05216e023fe19425048a0e2a4e0c14d2fb
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 14 09:09:49 2015 +1000

    Remove shrinkwrap

commit 2082345817e6cbcc8f008180f9e89f3ab04baedd
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 13 19:58:53 2015 +1000

    Add prod-debug config

commit eb8bc739c4bbe8eac675b41e6219e04fbf5b9d8e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 13 08:18:55 2015 +1000

    update shrinkwrap

commit 17b2363b1b87d12f6eed8ca90f7080faa7499811
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Oct 9 10:26:06 2015 +1000

    Updated zanata-ui to use npm dependency

    And small plural adaption fix when deleting a term

commit 284ab24b5da0e9e47631d38eee8207a2cf3de5db
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 8 21:40:15 2015 +1000

    Refactor frontend module - review 1

commit 2686163285e5f7814913ee4f6e1becc63674d151
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 7 13:09:30 2015 +1000

    Refactor react module for glossary

commit 947ecb43d917bb248a37e07b555645c7b67e3e55
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 6 06:05:29 2015 +1000

    Remove unused method

commit 3c57ca901f5d424540c37356df6055d189b72b0b
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 1 10:09:45 2015 +1000

    Update shrinkwrap and delete button

commit 25f55cda006688d9bdc3004cd961c0f87c4d7a4b
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 30 08:33:06 2015 +1000

    Rename method name in UserService

commit db9e3f62903f6ada03ef673e8da903f5c3bb9a83
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 29 16:08:55 2015 +1000

    Fix checkstyle

commit e2633bef6a3d3719ebc6ff263a28ac195f6b19d8
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 29 15:22:30 2015 +1000

    fix cancel button

commit 8a8355be2fe1ff9af01b15d93216f43c8270b83e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 29 09:34:53 2015 +1000

    Update shrinkwrap.json

commit 9c0dec75fe2fe9a5f241f87ab3cb2d974a0c2fd7
Merge: 6319a1d 5cbc534
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 28 16:38:48 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit 6319a1d07d3830de6df3ecde41ffcdee07d0eb21
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 28 16:30:00 2015 +1000

    Add delete confirmation

commit 75ef3ff03178fd7b3732b776cb63b0b6adfb09d4
Merge: b7c9240 a380e6e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 25 19:59:46 2015 +1000

    Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

commit b7c9240a1d9f5743c244a0469980cfd703456916
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 25 19:59:18 2015 +1000

    WIP: component test

commit a380e6ebaae2250b3224f003d75870f4eb90151d
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Sep 25 16:48:16 2015 +1000

    Design tweaks to modal and language selection

commit 293acb48c3308ed53e57ff80f9d9a26c10b641de
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 25 10:59:25 2015 +1000

    Update functional test

commit c5e021e86ea4bc71855e40068b082d01ca1f8a46
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 25 10:48:26 2015 +1000

    Refactor upload file modal

commit 8603dd72ac7370194e4f13790163e1177a17f4ba
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 24 16:15:11 2015 +1000

    New glossary modal

commit 08f110d4a96d4909605e4bf6ab74c2188f7b3713
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 24 16:02:40 2015 +1000

    Fix css for span cell

commit 8465e6a8896f3b5bf2d82b702fe6c08898b0728a
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 24 15:53:34 2015 +1000

    Unit test on glossary store

commit 5ae90be06a677c78c5279b8304e6359d5021e1d2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 24 11:33:21 2015 +1000

    Listener from InputCell

commit 9b38b394474bb42f8177d796e982d7b811a09675
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 24 08:52:26 2015 +1000

    Add glossaryhelper test

commit 0dce13a1be093b4253fbb5c975a9b1f37766937c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 23 21:18:04 2015 +1000

    Fix listener warning

commit c8445d345c119afd4e717e1591207c031236478a
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 23 16:16:36 2015 +1000

    Add hovering on row

commit 6945b391db5068a6f8cd1f46acb7994ae12aab9d
Merge: 4bd8a0d 05f5b7f
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 23 14:52:06 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit 4bd8a0d68cd4602b707fc31501b509363bab1842
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 22 16:16:23 2015 +1000

    Implement hover and focus behaviour

commit 2ef007c75012cd846f7ff30edac7d8f202c82ec8
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 22 10:32:33 2015 +1000

    Update test

commit c8beff944fb6067548f4f847a06d9bc8024561ca
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 21 13:17:20 2015 +1000

    Fix comment and DataTable selection

commit ec39c975d76200193438735c23a4cd4041f33bef
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 18 14:06:24 2015 +1000

    Create comment component

commit 5856a729a5704d68d819bbb846a7572277b3be4c
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 18 09:02:27 2015 +1000

    Refactor datatable for glossary

commit 9ad9f5760aa001241dc458f1ed2fdc4617ee0a26
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 17 16:06:09 2015 +1000

    Add component for comment

commit 16cb36f88f9da63501af99032f60dfadc3fe1a7a
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 17 15:29:36 2015 +1000

    Add integration test for glossary service

commit b07b9941b25a71ebc4655148f524b93ac8ea1154
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 17 08:40:54 2015 +1000

    Add unit test for glossary file service

commit 6282ce9468ac9701ff8ad0e034b3dbe5b200b41f
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 16 14:07:05 2015 +1000

    Add allowSort on header

commit 8aaee9d2aef534454b1909239c5859b62c3066c2
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 16 09:51:33 2015 +1000

    Update shrinkwrap.json

commit d490b6c1cf9a064e9c2f3792a52660a563e990fb
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 16 09:47:57 2015 +1000

    Add tooltip component

commit 43f00b39383b980ade1cd3445c1856c079d1f9c7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 15 16:38:24 2015 +1000

    Fix glossary search

commit 80801120f47524c34fdb4c997ebb6c34b6c17789
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 15 08:58:35 2015 +1000

    Update shrinkwrap.json

commit 78d34a4ccf3b2d3c28cae12b8d449a1e05291b8b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 14 16:52:04 2015 +1000

    Implement glossary permission

commit ce1ed7f5d408cb913d45e49243d6bbf6703de79b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 14 16:35:09 2015 +1000

    Fix glossary loading

commit 6d43adcae74b5e5d8db823d0fbfbdf5b207ff352
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 14 11:29:05 2015 +1000

    fix modified entry

commit 18c29f2629a985eae750ab4300ba492932dd8b03
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 14 09:27:23 2015 +1000

    Fix user information

commit 5cc7f51e99f8c8915f8845f42bab72a18b7e826b
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Sep 11 16:41:08 2015 +1000

    Replace pre with span on cell

commit d39c5d06db2e84867044fdab8baf0346504beb50
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Sep 11 16:40:46 2015 +1000

    Add loading cell

commit 5b26a018affba7ab1490eb40099f72746e1c2986
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Sep 11 16:40:23 2015 +1000

    Update icons

commit d84511288aca17504df2d6c9b8e625250975cad4
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Sep 11 15:49:55 2015 +1000

    Update search with new input options

commit 66f1656656d79aa73bcc8e79a0d056e1c9033889
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 11 15:10:45 2015 +1000

    Refactor user profile endpoint

commit bba05a81dd320106f25c801d474df3060370c360
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 11 11:12:28 2015 +1000

    Implement action cell

commit 2b5a0eaab370e67de27f386133890644a5d7ee39
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 10 15:46:27 2015 +1000

    WIP: action cell

commit 18aa597241e8d40163c9414f93bf3bc12fe2e323
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 10 09:32:55 2015 +1000

    Implement file upload for glossary

commit 4eb7953ae0db735050cf357d823e0978f922d65d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 8 14:23:12 2015 +1000

    WIP: uploading file

commit ec32e3c3693b443ba446bfd8f79f09cf88cf0916
Merge: 4fddb56 a2d0f30
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 8 11:37:06 2015 +1000

    Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

commit 4fddb5640a6cbebf68f0278d79dd02086cb39ea2
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 8 11:36:39 2015 +1000

    WIP: sorting for table header

commit a2d0f303c36b2b30924fe5c724040b9a212a01da
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Mon Sep 7 15:11:47 2015 +1000

    Remove need for extra fixed-data-table CSS

commit ff1904f3faf79ead9a91e9be152be6275655e90e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 4 15:52:27 2015 +1000

    WIP: bind focused row to state

commit 6ab96db37e978c318c67056348f374a237dd861e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 4 13:30:00 2015 +1000

    Add loading, new template for glossary

commit d1268d6f2d6da0aca526b4cbbe0f308f82f11009
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 4 13:29:38 2015 +1000

    Add loading, new template for glossary

commit 0c9d8b0e0e1546c3c450a5a5bb234a24904c3951
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Sep 4 10:13:54 2015 +1000

    Fix search input

commit f73e853da68a375e772941785e16a6d240db6b14
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 3 20:03:35 2015 +1000

    WIP: fix infinite scroll

commit ad5bd0ae4e1e1ab2108e0605de7babe8d41d5436
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Thu Sep 3 15:11:46 2015 +1000

    Fix row height and placeholder

commit 120fbc39fbd8d3c5434cf38362cc19cff3bbad8f
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Tue Sep 1 12:14:54 2015 +1000

    Fix search input and row height

commit 39aea21ae813560bcf5254e66a52462fd4cad9c5
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 3 15:20:42 2015 +1000

    WIP: infinite scroll for glossary table

commit dfde467b1aef1f575189bd8634ce3d2de8488cc2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Sep 3 14:47:29 2015 +1000

    WIP: infinite scroll for glossary data table

commit f17787753415aaeb91b7018a3f8ffd85a463ae7d
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Sep 2 17:33:58 2015 +1000

    Remove data state from glossary table

commit 49263b6229c689c5a170e018e8bcdc1623935eab
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 1 16:30:19 2015 +1000

    WIP: add glossary search

commit bb4c5cdc446e51e47733b0d9246b95ae312ec71c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 1 09:09:31 2015 +1000

    WIP: source and translation data table

commit ca4be077e38a75d26b758449f269aa6a7758d444
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 31 16:12:23 2015 +1000

    WIP: infinate scroll

commit a8a8c8d8da2ce03dc0b42426f448832efdb4a131
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 31 16:12:00 2015 +1000

    WIP: infinate scroll

commit beccc91f5a396b6d30bf4de6107de530484f7a84
Merge: 48e0e23 926071a
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Mon Aug 31 12:38:24 2015 +1000

    Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

    # By Alex Eng
    # Via Alex Eng
    * 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
      Bind clear, update and save action for glossary entry

    Conflicts:
    	frontend/src/main/web/lib/stores/GlossaryStore.js

commit 48e0e2333b3a4a3ba8d67f72c98a61324c5a7231
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Mon Aug 31 12:34:58 2015 +1000

    Update Data Table UI

commit 926071a5889f278f1b6f80df3340a946126c762f
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 31 11:22:11 2015 +1000

    Bind clear, update and save action for glossary entry

commit 6e9869476ab60511480d1641635d7c20842b3525
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Mon Aug 31 10:28:58 2015 +1000

    Update new components to work with existing data

commit ccc2cff94f977e1a6a3891714a62426b4570996b
Merge: 0ce82e8 1f268ef
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Aug 28 22:27:02 2015 +1000

    Merge branches 'rhbz1245433-glossary' and 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

    # By Alex Eng
    # Via Alex Eng
    * 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
      WIP: glossary data table

    # By Alex Eng
    # Via Alex Eng
    * 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
      WIP: glossary data table

    Conflicts:
    	frontend/src/main/web/index.html
    	frontend/src/main/web/lib/components/GlossaryDataTable.jsx
    	frontend/src/main/web/lib/components/SystemGlossary.jsx
    	frontend/src/main/web/lib/stores/GlossaryStore.js

commit 0ce82e881384477dca2247e252f6ba45169dd0d5
Author: Luke Brooker <mail at lukebrooker.com>
Date:   Fri Aug 28 22:22:19 2015 +1000

    Working integration with zanata-ui

commit 1f268ef8297db8ac40b3e4b7d46648faf341edaf
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 14 14:05:02 2015 +1000

    WIP: glossary data table

commit 084340e847389d348c1c6b1d9776d38780e494aa
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 14 14:05:02 2015 +1000

    WIP: glossary data table

commit d9bcf195f25c5706bc4e115c5d9ed817431002e0
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 14 09:56:05 2015 +1000

    Fix tests

commit a1b72752ed125283dc8fa952cf011f0005a0a716
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 13 16:51:54 2015 +1000

    Modified test data with new structure

commit 458c1d6a679b19b4484f2cdefb95b17376fe9012
Merge: 1ec2a30 9d0387e
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 13 14:12:44 2015 +1000

    Merge branch 'integration/master' into rhbz1245433-glossary

commit 1ec2a30e782f9e28b6dc19a9b7633776a94d7b73
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 11 16:36:46 2015 +1000

    WIP: add pos, and description for glossary entity

commit 1de186f2b1df2b166111201687d2d5bda2bed0b2
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 7 16:30:02 2015 +1000

    WIP: fixed-data-table

commit c0ed8ccabb5976646462bcee43996e05bc80f884
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Aug 5 16:19:39 2015 +1000

    Add lastmodified person to HGlossaryTerm

commit d596cefcd88123c0f75f9ff562025c5e4cd632b6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 4 15:44:27 2015 +1000

    WIP: implement glossary add, update and delete action

commit da1a90e4c528a3d05939a19ba5acba66d69576ac
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 4 11:11:03 2015 +1000

    Add delete glossary method

commit 86c23ddb081a9cabb4e4d43db69ce09ac49194bb
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 4 10:43:11 2015 +1000

    Load glossary when locale selected

commit aa2d6a396fb52bbce495fafc7374a4cc95c0d8ef
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 3 16:07:34 2015 +1000

    Add glossary store and event in frontend

commit 66d179d585b0f9d16186fb7441ffef32dee38534
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 30 11:41:33 2015 +1000

    Implement delete glossary, get glossary locale stats API

commit 0fff2413f299cc3eae78aaada6692ae4bbf2c2c7
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 30 11:20:36 2015 +1000

    Move 'User' creation to UserService

commit 58105651f080fbfa0cc3075ce9840abf38638b90
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 29 14:21:57 2015 +1000

    Add testing page for different views

commit eca30c7a56dd8fb53777fb536d434d1a46d1f167
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 28 16:28:14 2015 +1000

    Refactor frontend for different view

commit 724697d768fe60d91211e385434806b6296dcf2d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 28 10:50:56 2015 +1000

    Move user-profile-page as frontend package


  Commit: 4b45b0b3b841f82487f5cfe9d92d29352abc488c
      https://github.com/zanata/zanata-server/commit/4b45b0b3b841f82487f5cfe9d92d29352abc488c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/InputCell.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java

  Log Message:
  -----------
  fix(glossary): limit glossary input field

https://zanata.atlassian.net/browse/ZNTA-755
https://zanata.atlassian.net/browse/ZNTA-753


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

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/InputCell.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1030 from zanata/ZNTA-573

fix(glossary): limit glossary input field


  Commit: 37d95f818ea4b2ec8f7e1f55f34f2ede8c03cbd5
      https://github.com/zanata/zanata-server/commit/37d95f818ea4b2ec8f7e1f55f34f2ede8c03cbd5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java

  Log Message:
  -----------
  fix(glossary):hide delete button for non-glossary admin user

https://zanata.atlassian.net/browse/ZNTA-757


  Commit: 156703d99b806ace7e197fc885b74d532f6f0001
      https://github.com/zanata/zanata-server/commit/156703d99b806ace7e197fc885b74d532f6f0001
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx

  Log Message:
  -----------
  fix(glossary): show not supported file message

https://zanata.atlassian.net/browse/ZNTA-756
Q


  Commit: d0fd8253bdc4f6aac0ea3cab0bca6fee0b80cacf
      https://github.com/zanata/zanata-server/commit/d0fd8253bdc4f6aac0ea3cab0bca6fee0b80cacf
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  Updated Zanata UI


  Commit: 532f95b6532a80c4c5a96d4497de703ab9dedcce
      https://github.com/zanata/zanata-server/commit/532f95b6532a80c4c5a96d4497de703ab9dedcce
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx

  Log Message:
  -----------
  Add empty state to glossary table


  Commit: 2de86f8818049da142424d38fac8f54125d4155d
      https://github.com/zanata/zanata-server/commit/2de86f8818049da142424d38fac8f54125d4155d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java

  Log Message:
  -----------
  Merge pull request #1031 from zanata/ZNTA-757

fix(glossary):hide delete button for non-glossary admin user


  Commit: 9be175bbc7c505e3e7f081c8cc932f3105f643c1
      https://github.com/zanata/zanata-server/commit/9be175bbc7c505e3e7f081c8cc932f3105f643c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx

  Log Message:
  -----------
  Merge pull request #1032 from zanata/ZNTA-756

fix(glossary): show not supported file message


  Commit: 2a997ba9f310cf1e80464b48d6dbdfd80d213018
      https://github.com/zanata/zanata-server/commit/2a997ba9f310cf1e80464b48d6dbdfd80d213018
  Author: daisy-ycguo <guoyingc at cn.ibm.com>
  Date:   2015-11-11 (Wed, 11 Nov 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/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Add a new parameter includeAutomatedEntry to API getContributionStatistics


  Commit: 211b74da79118c4717ff585ab0666aaaa951ba55
      https://github.com/zanata/zanata-server/commit/211b74da79118c4717ff585ab0666aaaa951ba55
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #1002 from zanata/doc-path-fix

fix: url for documents with paths


  Commit: 029f507631d44d9d7bbb8ee466f9556670962c2b
      https://github.com/zanata/zanata-server/commit/029f507631d44d9d7bbb8ee466f9556670962c2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    M frontend/src/main/web/index.html
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/Comment.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M mkdocs.yml

  Log Message:
  -----------
  fix(glossary):fix update comment,sort,and tooltip on source

https://zanata.atlassian.net/browse/ZNTA-760
https://zanata.atlassian.net/browse/ZNTA-759


  Commit: e2d17c0360ce36001464d71b43aaed5696881f76
      https://github.com/zanata/zanata-server/commit/e2d17c0360ce36001464d71b43aaed5696881f76
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependencies): Update zanata dependencies for 3.8.0


  Commit: a4eea5ae99c195c5775234fb2b7b7ac3175a9370
      https://github.com/zanata/zanata-server/commit/a4eea5ae99c195c5775234fb2b7b7ac3175a9370
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1034 from zanata/3.8.0-zanata-dependencies

chore(dependencies): Update zanata dependencies for 3.8.0


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-api version


  Commit: 0fda6bef603b1f59709cbeabbf09d1787d06d6df
      https://github.com/zanata/zanata-server/commit/0fda6bef603b1f59709cbeabbf09d1787d06d6df
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Add tooltip to readonly descriptions


  Commit: bb9a0ca00bc580702a03bbad8aec1bb0f73aa6b7
      https://github.com/zanata/zanata-server/commit/bb9a0ca00bc580702a03bbad8aec1bb0f73aa6b7
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx

  Log Message:
  -----------
  Add autofocus to new term dialog


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

  Changed paths:
    M docs/images/glossary-edit.png
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/insert-term.md
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/constants/Messages.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M frontend/src/main/web/package.json
    M mkdocs.yml

  Log Message:
  -----------
  Update documentations for glossary


  Commit: fd909284eb7b7fe18d4c94afae14763295f3f401
      https://github.com/zanata/zanata-server/commit/fd909284eb7b7fe18d4c94afae14763295f3f401
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  Add better filtering with no results support


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

  Changed paths:
    M pom.xml

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


  Commit: 3a17dc521eac5d637c76cecb377da60a99045c14
      https://github.com/zanata/zanata-server/commit/3a17dc521eac5d637c76cecb377da60a99045c14
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update assets version to 8.0.5


  Commit: 0eb0fdb957cbafdf6c462c2bb035ed2983e5a725
      https://github.com/zanata/zanata-server/commit/0eb0fdb957cbafdf6c462c2bb035ed2983e5a725
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M pom.xml

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


  Commit: 30650022b476e7cc0765d4b9c3dc48439a01e001
      https://github.com/zanata/zanata-server/commit/30650022b476e7cc0765d4b9c3dc48439a01e001
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    M frontend/src/main/web/index.html
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/Comment.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/constants/Messages.js
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M frontend/src/main/web/package.json
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #1033 from zanata/Glossary-usability

fix(glossary):fix update comment,sort,and tooltip on source


  Commit: 7e06dbe2b9ff4dc1a1875638c36ec1b931c711ce
      https://github.com/zanata/zanata-server/commit/7e06dbe2b9ff4dc1a1875638c36ec1b931c711ce
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Better formatting of language select list


  Commit: b615ede0aeabe3e61f3aaf122fd1959a69ca9e50
      https://github.com/zanata/zanata-server/commit/b615ede0aeabe3e61f3aaf122fd1959a69ca9e50
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    R frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml

  Log Message:
  -----------
  Separate front-end CSS into separate file


  Commit: 968ac7b6a0ceb81936a90a223cbbbd15f294c963
      https://github.com/zanata/zanata-server/commit/968ac7b6a0ceb81936a90a223cbbbd15f294c963
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java

  Log Message:
  -----------
  fix(glossary):hide delete button for non-glossary admin user

https://zanata.atlassian.net/browse/ZNTA-757


  Commit: 30036b61ee24aa858b04e912a2aff03ce2efc383
      https://github.com/zanata/zanata-server/commit/30036b61ee24aa858b04e912a2aff03ce2efc383
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx

  Log Message:
  -----------
  fix(glossary): show not supported file message

https://zanata.atlassian.net/browse/ZNTA-756
Q


  Commit: a06e9f7208fe63f9a3fec5eb9edac5d578c7a094
      https://github.com/zanata/zanata-server/commit/a06e9f7208fe63f9a3fec5eb9edac5d578c7a094
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    M frontend/src/main/web/index.html
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/Comment.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M mkdocs.yml

  Log Message:
  -----------
  fix(glossary):fix update comment,sort,and tooltip on source

https://zanata.atlassian.net/browse/ZNTA-760
https://zanata.atlassian.net/browse/ZNTA-759


  Commit: dcca12edfd2dbdad25254f979f0d170fd94bbd83
      https://github.com/zanata/zanata-server/commit/dcca12edfd2dbdad25254f979f0d170fd94bbd83
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependencies): Update zanata dependencies for 3.8.0


  Commit: f3d36891ae243356bdbed22676a4d5ee74b505ac
      https://github.com/zanata/zanata-server/commit/f3d36891ae243356bdbed22676a4d5ee74b505ac
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M docs/images/glossary-edit.png
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/insert-term.md
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/constants/Messages.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M frontend/src/main/web/package.json
    M mkdocs.yml

  Log Message:
  -----------
  Update documentations for glossary


  Commit: dc7b8794220044fb70ac4e01cae5c9625fe272fb
      https://github.com/zanata/zanata-server/commit/dc7b8794220044fb70ac4e01cae5c9625fe272fb
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update assets version to 8.0.5


  Commit: 62c357d5a98a602c65b45ba108fe2afacb58a721
      https://github.com/zanata/zanata-server/commit/62c357d5a98a602c65b45ba108fe2afacb58a721
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Remove duplicate module requirement


  Commit: 5912667c0f52b21cafd12bd699ea8089c8a14cf9
      https://github.com/zanata/zanata-server/commit/5912667c0f52b21cafd12bd699ea8089c8a14cf9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/release-notes.md
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    A docs/user-guide/system-admin/configuration/mac-installation.md
    M frontend/pom.xml
    A frontend/src/main/web/.gitignore
    A frontend/src/main/web/README.md
    A frontend/src/main/web/copy.sh
    A frontend/src/main/web/index.css
    A frontend/src/main/web/index.html
    A frontend/src/main/web/index.js
    A frontend/src/main/web/lib/actions/GlossaryActions.js
    A frontend/src/main/web/lib/actions/UserMatrixActions.js
    A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/lib/components/ContributionChart.jsx
    A frontend/src/main/web/lib/components/DayMatrix.jsx
    A frontend/src/main/web/lib/components/DropDown.jsx
    A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/lib/components/MessageModal.jsx
    A frontend/src/main/web/lib/components/RecentContributions.jsx
    A frontend/src/main/web/lib/components/RootContent.jsx
    A frontend/src/main/web/lib/components/SystemGlossary.jsx
    A frontend/src/main/web/lib/components/UserProfile.jsx
    A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    A frontend/src/main/web/lib/components/glossary/DataTable.jsx
    A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    A frontend/src/main/web/lib/components/glossary/InputCell.jsx
    A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    A frontend/src/main/web/lib/constants/ActionTypes.js
    A frontend/src/main/web/lib/constants/Configs.js
    A frontend/src/main/web/lib/constants/Messages.js
    A frontend/src/main/web/lib/constants/Options.js
    A frontend/src/main/web/lib/constants/Views.js
    A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    A frontend/src/main/web/lib/stores/GlossaryStore.js
    A frontend/src/main/web/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/lib/stores/testData/glossary/entries.json
    A frontend/src/main/web/lib/stores/testData/glossary/info.json
    A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/lib/utils/DateHelper.js
    A frontend/src/main/web/lib/utils/GlossaryHelper.js
    A frontend/src/main/web/lib/utils/StringUtils.js
    A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/package.json
    A frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/server.js
    R frontend/src/main/web/user-profile-page/README.md
    R frontend/src/main/web/user-profile-page/copy.sh
    R frontend/src/main/web/user-profile-page/index.html
    R frontend/src/main/web/user-profile-page/index.js
    R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/web/user-profile-page/lib/constants/Options.js
    R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    R frontend/src/main/web/user-profile-page/package.json
    R frontend/src/main/web/user-profile-page/preprocessor.js
    R frontend/src/main/web/user-profile-page/server.js
    R frontend/src/main/web/user-profile-page/webpack.config.js
    R frontend/src/main/web/user-profile-page/webpack.prod.config.js
    A frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.prod.config.js
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    R 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/testharness/TestPlan.java
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    R zanata-model/src/main/java/org/zanata/model/HTermComment.java
    A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    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/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
    A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.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/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    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/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.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/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/Repeat.java
    A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.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/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
    M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin' into automatedEntry


  Commit: c4796da4dc3d708be34adb39f2f2b779f88218b7
      https://github.com/zanata/zanata-server/commit/c4796da4dc3d708be34adb39f2f2b779f88218b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Add loader to load,sort,filter action


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

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-758-glossary-usability


  Commit: 607cfecedc459e8bdf069444a0c6b2617e7bf146
      https://github.com/zanata/zanata-server/commit/607cfecedc459e8bdf069444a0c6b2617e7bf146
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

  Log Message:
  -----------
  fix(search page icon): update project icon in search page

https://zanata.atlassian.net/browse/ZNTA-775


  Commit: cffb202ff06a91be9897a701fad4ca3a2ce94587
      https://github.com/zanata/zanata-server/commit/cffb202ff06a91be9897a701fad4ca3a2ce94587
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

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

* origin/release:
  fix: url for documents with paths

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


  Commit: 7b2050aedbbd1ea48ce3114f6b95626892c80d0b
      https://github.com/zanata/zanata-server/commit/7b2050aedbbd1ea48ce3114f6b95626892c80d0b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #1038 from zanata/ZNTA-775-Icon

fix(search page icon): update project icon in search page


  Commit: 613b9788539bcc8548de43b51faac1b117372660
      https://github.com/zanata/zanata-server/commit/613b9788539bcc8548de43b51faac1b117372660
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(activate account): redirect to login page after account activate

https://zanata.atlassian.net/browse/ZNTA-720


  Commit: 7ac5b6ce1de3efa58ba3645af605768cf7a0f4b2
      https://github.com/zanata/zanata-server/commit/7ac5b6ce1de3efa58ba3645af605768cf7a0f4b2
  Author: anipeter <apeter at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  Merge pull request #1039 from zanata/ZNTA-720-login

fix(activate account): redirect to login page after account activate


  Commit: 5f9a5c79e4c02335eacbb4e6aa153bf2c8aa7330
      https://github.com/zanata/zanata-server/commit/5f9a5c79e4c02335eacbb4e6aa153bf2c8aa7330
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  fix(user-profile): fix user profile page display

https://zanata.atlassian.net/browse/ZNTA-774


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

  Changed paths:
    M pom.xml
    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/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #1029 from daisy-ycguo/automatedEntry

Add a new parameter includeAutomatedEntry to API getContributionStatistics


  Commit: 0053b6c4ba0deded0ee7bd831578ed432d99e979
      https://github.com/zanata/zanata-server/commit/0053b6c4ba0deded0ee7bd831578ed432d99e979
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Merge pull request #1037 from zanata/ZNTA-774-User-Profile-Page

fix(user-profile): fix user profile page display


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

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java

  Log Message:
  -----------
  Change column title to selected locale, set utf-8 for file upload


  Commit: 382bec3f1becaa9a2af960504560f5f40de1d8c7
      https://github.com/zanata/zanata-server/commit/382bec3f1becaa9a2af960504560f5f40de1d8c7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    R frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml

  Log Message:
  -----------
  Merge pull request #1036 from zanata/ZNTA-758-glossary-usability

ZNTA-758 Glossary Usability


  Commit: 1997154af5975c3afc59fcb7fccb52bde1a0972b
      https://github.com/zanata/zanata-server/commit/1997154af5975c3afc59fcb7fccb52bde1a0972b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-api to 3.8.3-SNAPSHOT


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 3.4.1


  Commit: 4e46faf2785737c2ef39282b2a1bf36774cf3072
      https://github.com/zanata/zanata-server/commit/4e46faf2785737c2ef39282b2a1bf36774cf3072
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

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

  Log Message:
  -----------
  fix(revert translation): fix null pointer exception when revert translation

https://zanata.atlassian.net/browse/ZNTA-738


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1040 from zanata/update-zanata-api-version

Downgrade zanata-api to 3.8.3-SNAPSHOT


  Commit: 2126030ea7937b5110428a5236b0f54f9106b8d1
      https://github.com/zanata/zanata-server/commit/2126030ea7937b5110428a5236b0f54f9106b8d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #1044 from zanata/ZNTA-738-null-pointer

fix(revert translation): fix null pointer exception when revert translation


  Commit: 3b5fa67799e9454da4d072998d8519a6ee7be63f
      https://github.com/zanata/zanata-server/commit/3b5fa67799e9454da4d072998d8519a6ee7be63f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    M pom.xml
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java

  Log Message:
  -----------
  fix(glossary):Add utf8 for glossary po file upload


  Commit: 324b49fa7b75f33e1091e38e6ddcceed4fa37bb5
      https://github.com/zanata/zanata-server/commit/324b49fa7b75f33e1091e38e6ddcceed4fa37bb5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #1043 from zanata/ZNTA-778-utf-8

fix(glossary):Add utf8 for glossary po file upload


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

  Changed paths:
    M docs/user-guide/glossary/delete-glossaries.md

  Log Message:
  -----------
  fix(doc): update glossary delete


  Commit: 08fe342a95a9e173cdc397e3bed34f6dbb9129f0
      https://github.com/zanata/zanata-server/commit/08fe342a95a9e173cdc397e3bed34f6dbb9129f0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-20 (Fri, 20 Nov 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_ca.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_es.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_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata.xml

  Log Message:
  -----------
  misc(translation): Update zanata.xml and translation


  Commit: 1bb88c1a3d894f5c147391ead32e949197107823
      https://github.com/zanata/zanata-server/commit/1bb88c1a3d894f5c147391ead32e949197107823
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies to latest release


  Commit: 925b6bd88670858902b6a6beaaa98ab9998ea233
      https://github.com/zanata/zanata-server/commit/925b6bd88670858902b6a6beaaa98ab9998ea233
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-11-22 (Sun, 22 Nov 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.8.0-rc-1


  Commit: 2f29203189bfebf18179a1d02bc05f60632dc9cb
      https://github.com/zanata/zanata-server/commit/2f29203189bfebf18179a1d02bc05f60632dc9cb
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-11-22 (Sun, 22 Nov 2015)

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

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


  Commit: 49166d05f402defd17a431058b6cc4a7ef15966e
      https://github.com/zanata/zanata-server/commit/49166d05f402defd17a431058b6cc4a7ef15966e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(activation): display activation message

https://zanata.atlassian.net/browse/ZNTA-720


  Commit: fe6af4beda6a8e5ccbc2a7d27d3793837f371a59
      https://github.com/zanata/zanata-server/commit/fe6af4beda6a8e5ccbc2a7d27d3793837f371a59
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  Merge pull request #1045 from zanata/activation-message

fix(activation): display activation message


  Commit: 3d4e7fe1411784d922e1905da151ba384f03904c
      https://github.com/zanata/zanata-server/commit/3d4e7fe1411784d922e1905da151ba384f03904c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/search.xhtml

  Log Message:
  -----------
  fix(admin search): update broken tooltip

https://zanata.atlassian.net/browse/ZNTA-715


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

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/search.xhtml

  Log Message:
  -----------
  Merge pull request #1046 from zanata/ZNTA-715-tooltip

fix(admin search): update broken tooltip


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

  Changed paths:
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/project-maintainer-guide.md

  Log Message:
  -----------
  fix(doc link): update broken link in documentation


  Commit: 70d53accf91a34afed24bde1e5f95b0f791e591e
      https://github.com/zanata/zanata-server/commit/70d53accf91a34afed24bde1e5f95b0f791e591e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    A zanata-war/src/main/webapp/admin/monitoring.xhtml

  Log Message:
  -----------
  fix(ZNTA-803): Fix broken link to admin monitoring page


  Commit: 20f52eae779d1ac23b16078cf1023f6377aeb801
      https://github.com/zanata/zanata-server/commit/20f52eae779d1ac23b16078cf1023f6377aeb801
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

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

  Log Message:
  -----------
  Ensure that we replace JavaMelody's MonitoringFilter


  Commit: 768ea9602fe7c0666a25f9d2e3e84831739a3797
      https://github.com/zanata/zanata-server/commit/768ea9602fe7c0666a25f9d2e3e84831739a3797
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  fix(url):handle whitespace and slash in doc id url

https://zanata.atlassian.net/browse/ZNTA-767


  Commit: e165762e56bbfbfe19078081ea0d88a782e570b6
      https://github.com/zanata/zanata-server/commit/e165762e56bbfbfe19078081ea0d88a782e570b6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Merge pull request #1053 from zanata/ZNTA-767

fix(url):handle whitespace and slash in doc id url


  Commit: d064326e53d2b0ffde92099f6ac6ee345c4dcfe3
      https://github.com/zanata/zanata-server/commit/d064326e53d2b0ffde92099f6ac6ee345c4dcfe3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java

  Log Message:
  -----------
  fix(login redirect): prevent redirect to login page after login

https://zanata.atlassian.net/browse/ZNTA-815


  Commit: 071e2444b5533c027d7fb39f083102d94a70dac7
      https://github.com/zanata/zanata-server/commit/071e2444b5533c027d7fb39f083102d94a70dac7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml

  Log Message:
  -----------
  fix(add language):add new language using selected text

https://zanata.atlassian.net/browse/ZNTA-657


  Commit: 3b8cf7e72a528f47cc43667b15707fa130f7c48a
      https://github.com/zanata/zanata-server/commit/3b8cf7e72a528f47cc43667b15707fa130f7c48a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java

  Log Message:
  -----------
  fix(terms url):fix invalid default terms url

https://zanata.atlassian.net/browse/ZNTA-817


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

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(email update):show confirmation message after email change

https://zanata.atlassian.net/browse/ZNTA-816


  Commit: 2e364d5100b6c05215601da330e5e6349dc692dd
      https://github.com/zanata/zanata-server/commit/2e364d5100b6c05215601da330e5e6349dc692dd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/util/FileUtil.java

  Log Message:
  -----------
  fix(file project type):fix pot file download in file project type

https://zanata.atlassian.net/browse/ZNTA-811


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java

  Log Message:
  -----------
  fix(validation):remove line count check in leading newline validation

https://zanata.atlassian.net/browse/ZNTA-726


  Commit: 50eda9ba2d48d6e051d9e9968ac458b182a29556
      https://github.com/zanata/zanata-server/commit/50eda9ba2d48d6e051d9e9968ac458b182a29556
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependency): update to zanata-assets-8.1


  Commit: 829fe735f2a8d4588dc296261e21d30f6c9aff36
      https://github.com/zanata/zanata-server/commit/829fe735f2a8d4588dc296261e21d30f6c9aff36
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  fix(show password):enable 'show' password after reset

https://zanata.atlassian.net/browse/ZNTA-818


  Commit: 42ec5b14535db90a4741f3d970eb62276a7bf06e
      https://github.com/zanata/zanata-server/commit/42ec5b14535db90a4741f3d970eb62276a7bf06e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  fix(disabled account):enable tooltip for disabled account
fix(account activation): handle enter key pressed

https://zanata.atlassian.net/browse/ZNTA-813
https://zanata.atlassian.net/browse/ZNTA-814


  Commit: 57a4555240779f1dd6f8b917bf1528b049d4d475
      https://github.com/zanata/zanata-server/commit/57a4555240779f1dd6f8b917bf1528b049d4d475
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    A zanata-war/src/main/webapp/admin/monitoring.xhtml

  Log Message:
  -----------
  Merge pull request #1047 from zanata/fix-admin-monitoring-link

fix(ZNTA-803): Fix broken link to admin monitoring page


  Commit: 35b68f48d93517f68fe366b352532d9144aecd21
      https://github.com/zanata/zanata-server/commit/35b68f48d93517f68fe366b352532d9144aecd21
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  fix(account activation): handle enter key pressed

https://zanata.atlassian.net/browse/ZNTA-814


  Commit: f9e08eb19d04489a1527d88e84ce53e5db5868ec
      https://github.com/zanata/zanata-server/commit/f9e08eb19d04489a1527d88e84ce53e5db5868ec
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.8.0-rc-2


  Commit: 5055d2303887cac3a867b16bd29aa4e90198d70b
      https://github.com/zanata/zanata-server/commit/5055d2303887cac3a867b16bd29aa4e90198d70b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

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


  Commit: 8ee9f78234e6267185fafe7ebd22071771338b4b
      https://github.com/zanata/zanata-server/commit/8ee9f78234e6267185fafe7ebd22071771338b4b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.8.0-rc-3


  Commit: f9775064adedba1b75245521251cbfcf8ceedea4
      https://github.com/zanata/zanata-server/commit/f9775064adedba1b75245521251cbfcf8ceedea4
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

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


  Commit: 3e0d479970add4aab115966d137e28824da7cde8
      https://github.com/zanata/zanata-server/commit/3e0d479970add4aab115966d137e28824da7cde8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  chore(dependency): remove duplicate cdi-unit


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #1066 from zanata/remove-duplicate-cdi-unit

chore(dependency): remove duplicate cdi-unit


  Commit: 6439c5de30ba1fdcc4b178779d709e2c589c2e79
      https://github.com/zanata/zanata-server/commit/6439c5de30ba1fdcc4b178779d709e2c589c2e79
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.8.0-rc-4


  Commit: bd9c23ce81e1ef436c6fa1893749bcf7e8a32486
      https://github.com/zanata/zanata-server/commit/bd9c23ce81e1ef436c6fa1893749bcf7e8a32486
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

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


  Commit: 9a09313ba5dcbe3a5446e1a30f7fedb2a8007007
      https://github.com/zanata/zanata-server/commit/9a09313ba5dcbe3a5446e1a30f7fedb2a8007007
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(javadoc): -Xdoclint:none


  Commit: 16e2d493302977f1ceb8540a3fb906b3bd24f6e5
      https://github.com/zanata/zanata-server/commit/16e2d493302977f1ceb8540a3fb906b3bd24f6e5
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.8.0-rc-5


  Commit: d2f5f9f99847e7bc56c046d1cbe8cf74c9989cde
      https://github.com/zanata/zanata-server/commit/d2f5f9f99847e7bc56c046d1cbe8cf74c9989cde
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

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


  Commit: 55766099b9348e139eecd777ebfaf0f57f179a94
      https://github.com/zanata/zanata-server/commit/55766099b9348e139eecd777ebfaf0f57f179a94
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml

  Log Message:
  -----------
  fix(Project search&replace):fix bad encoding in search text

https://zanata.atlassian.net/browse/ZNTA-812


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

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(login redirect):prevent login page redirection after activate account

https://zanata.atlassian.net/browse/ZNTA-815


  Commit: 30824c1fda1599d3d533a8ffe0c1f71e380306e2
      https://github.com/zanata/zanata-server/commit/30824c1fda1599d3d533a8ffe0c1f71e380306e2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  Merge pull request #1068 from zanata/ZNTA-815

fix(login redirect):prevent login page redirection after activate account


  Commit: 510d73bbaed5ef46a1115d42f93bc2a2a5663e9d
      https://github.com/zanata/zanata-server/commit/510d73bbaed5ef46a1115d42f93bc2a2a5663e9d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1067 from zanata/ZNTA-812

fix(Project search&replace):fix bad encoding in search text


  Commit: e754d163e92ce93dcc8d88503a6c5be497ca5fed
      https://github.com/zanata/zanata-server/commit/e754d163e92ce93dcc8d88503a6c5be497ca5fed
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

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

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


  Commit: 25ac0db5e77ff112fb6fe52dafbe730b80bbe263
      https://github.com/zanata/zanata-server/commit/25ac0db5e77ff112fb6fe52dafbe730b80bbe263
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

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

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


  Commit: 464a67a602281ff0096cee106fb6c3cf09eef6ea
      https://github.com/zanata/zanata-server/commit/464a67a602281ff0096cee106fb6c3cf09eef6ea
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies


  Commit: 122b164622f5c9f006af88a349f58d93937d4fbb
      https://github.com/zanata/zanata-server/commit/122b164622f5c9f006af88a349f58d93937d4fbb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  fix(merge trans dialog):update broken dialog for merge trans

https://zanata.atlassian.net/browse/ZNTA-844


  Commit: 53265952868a9aab05b3802d569573c72437be7c
      https://github.com/zanata/zanata-server/commit/53265952868a9aab05b3802d569573c72437be7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

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

  Log Message:
  -----------
  Merge pull request #1069 from zanata/ZNTA-844

fix(merge trans dialog):update broken dialog for merge trans


  Commit: c38aa75e29ab93e5242490bd693e0960be8d31e5
      https://github.com/zanata/zanata-server/commit/c38aa75e29ab93e5242490bd693e0960be8d31e5
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

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

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


  Commit: 8bca53f5233e30c043ecff545b404013d6373cd2
      https://github.com/zanata/zanata-server/commit/8bca53f5233e30c043ecff545b404013d6373cd2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

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

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


  Commit: 2607256c6cd21b1ef9619415aa7d240b60c177a2
      https://github.com/zanata/zanata-server/commit/2607256c6cd21b1ef9619415aa7d240b60c177a2
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Add version 3.8.1


  Commit: 2a68dfa7b9ca7cde0143c218711b30f50cf6dee3
      https://github.com/zanata/zanata-server/commit/2a68dfa7b9ca7cde0143c218711b30f50cf6dee3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-04 (Mon, 04 Jan 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java

  Log Message:
  -----------
  fix(glossary): prevent load of description for undefined term

https://zanata.atlassian.net/browse/ZNTA-854


  Commit: ca05fff3f0b2d74f75e2a62a1ad5afa0b5124da8
      https://github.com/zanata/zanata-server/commit/ca05fff3f0b2d74f75e2a62a1ad5afa0b5124da8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java

  Log Message:
  -----------
  Merge pull request #1074 from zanata/ZNTA-854

fix(glossary): prevent load of description for undefined term


  Commit: eff47ad2e0c745078b55ce8153a728b4cf1fe1d6
      https://github.com/zanata/zanata-server/commit/eff47ad2e0c745078b55ce8153a728b4cf1fe1d6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

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

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


  Commit: ef1cc7ad0714cf2564a689299d3bda0185936f62
      https://github.com/zanata/zanata-server/commit/ef1cc7ad0714cf2564a689299d3bda0185936f62
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

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

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


  Commit: 3473006bf62034b76da03dd0da1de7da5f25cfce
      https://github.com/zanata/zanata-server/commit/3473006bf62034b76da03dd0da1de7da5f25cfce
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Move to New Feature: Bug 1233524 - Update project search page to include user

As well as fixing some format error


  Commit: bf8490460ed3cf2c6cc0defbd8232c8e96f25644
      https://github.com/zanata/zanata-server/commit/bf8490460ed3cf2c6cc0defbd8232c8e96f25644
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M docs/user-guide/account/account-sign-up.md

  Log Message:
  -----------
  doc(user-guide): Add fedora.zanata.org


  Commit: ea521c35637b66e190dff46c3e9136a52c290ad7
      https://github.com/zanata/zanata-server/commit/ea521c35637b66e190dff46c3e9136a52c290ad7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java

  Log Message:
  -----------
  ZNTA-519 - allow _-. in doc name


  Commit: 18438cc47b7789d105358f329beebfe7316ca4a5
      https://github.com/zanata/zanata-server/commit/18438cc47b7789d105358f329beebfe7316ca4a5
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M CONTRIBUTING.md

  Log Message:
  -----------
  docs: add CONTRIBUTING.md


  Commit: ac627c99148b119923e2aea844684a8c037b02e8
      https://github.com/zanata/zanata-server/commit/ac627c99148b119923e2aea844684a8c037b02e8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M CONTRIBUTING.md

  Log Message:
  -----------
  Merge pull request #1098 from zanata/contributing

docs: add CONTRIBUTING.md


  Commit: 90ff8a9724c2aef55d504e365248198f05e9890d
      https://github.com/zanata/zanata-server/commit/90ff8a9724c2aef55d504e365248198f05e9890d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-03-14 (Mon, 14 Mar 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  fix(version): delete version

https://zanata.atlassian.net/browse/ZNTA-953


  Commit: 2507a8165bf7c3ccd992315ce2bc4d1b7929ca24
      https://github.com/zanata/zanata-server/commit/2507a8165bf7c3ccd992315ce2bc4d1b7929ca24
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-03-14 (Mon, 14 Mar 2016)

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

  Log Message:
  -----------
  fix(js zanata): fix undefined zanata jquery plugin


  Commit: d9d62c3b388251eec795d2523c19ad7e95291f82
      https://github.com/zanata/zanata-server/commit/d9d62c3b388251eec795d2523c19ad7e95291f82
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-03-14 (Mon, 14 Mar 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #1113 from zanata/ZNTA-953

fix(version): delete version


  Commit: 9db421373b1cde987bd11bc62957cee008edb031
      https://github.com/zanata/zanata-server/commit/9db421373b1cde987bd11bc62957cee008edb031
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(profile): disable doclint for Java 8 when building with release


  Commit: 3bf539bbcd876ba70284bf54bc4614b5c7cc1549
      https://github.com/zanata/zanata-server/commit/3bf539bbcd876ba70284bf54bc4614b5c7cc1549
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1120 from zanata/doclint-java8-disable

chore(profile): disable doclint for Java 8 when building with release


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

  Changed paths:
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  fix(npm): update dom-event package in frontend


  Commit: 395f25e457c7656149131b9b2f7d102d133d8508
      https://github.com/zanata/zanata-server/commit/395f25e457c7656149131b9b2f7d102d133d8508
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  Merge pull request #1121 from zanata/fix-npm-dom-event

fix(npm): update dom-event package in frontend


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependency):zanata-api-3.8.4


  Commit: 03c2b456ad574ec826b1b36eecf9bbb4eef700e2
      https://github.com/zanata/zanata-server/commit/03c2b456ad574ec826b1b36eecf9bbb4eef700e2
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1124 from zanata/zanata-api-3.8.4

chore(dependency):zanata-api-3.8.4


  Commit: 9a77f8fd74dc3acfc1fb5aa8bd98eb428c6c8fb6
      https://github.com/zanata/zanata-server/commit/9a77f8fd74dc3acfc1fb5aa8bd98eb428c6c8fb6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

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

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


  Commit: 928e7d700e0ae4b44351a9d0e50d29df5f79e260
      https://github.com/zanata/zanata-server/commit/928e7d700e0ae4b44351a9d0e50d29df5f79e260
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

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

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


  Commit: 5967840991e142d4f3e3da5961aa92c1aa247e39
      https://github.com/zanata/zanata-server/commit/5967840991e142d4f3e3da5961aa92c1aa247e39
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java

  Log Message:
  -----------
  fix(functional test): fix broken functional test


  Commit: a1da4b2315ecd8a7cbe9f916f1c9bebf96d9081d
      https://github.com/zanata/zanata-server/commit/a1da4b2315ecd8a7cbe9f916f1c9bebf96d9081d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java

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

fix(functional test): fix broken functional test


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  fix(merge translation): fix merge translation exception with new translation

https://zanata.atlassian.net/browse/ZNTA-1013


  Commit: 218421be027fa08f7b8a686c966ff1265be36207
      https://github.com/zanata/zanata-server/commit/218421be027fa08f7b8a686c966ff1265be36207
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-987): track deleted HTextFlowTargets by ID

The equals method for HTextFlowTargets won't recognise the object if
any fields have changed, so tracking by ID is safer (unless we implement
business key equality).

Fixes the bug where merge-type=import sets state of HTextFlowTargets
to New.


  Commit: 0e69849c93562f087f06f4fc3c14eec6d830fb90
      https://github.com/zanata/zanata-server/commit/0e69849c93562f087f06f4fc3c14eec6d830fb90
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1132 from zanata/ZNTA-1013

fix(merge translation): fix merge translation exception with new translation


  Commit: 5da61b412f192c4722e526a06649c4e22f82453a
      https://github.com/zanata/zanata-server/commit/5da61b412f192c4722e526a06649c4e22f82453a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-959,ZNTA-1000): Add try catch for copy version task

https://zanata.atlassian.net/browse/ZNTA-959

https://zanata.atlassian.net/browse/ZNTA-1000


  Commit: 278e25175d7fc5a8a55521459d1e58014e139c8e
      https://github.com/zanata/zanata-server/commit/278e25175d7fc5a8a55521459d1e58014e139c8e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java

  Log Message:
  -----------
  fix(copy version): fix null pointer exception when copy version (#1133)

* fix(copy version): Add try catch for copy version task

https://zanata.atlassian.net/browse/ZNTA-959
https://zanata.atlassian.net/browse/ZNTA-1000

* fix(copy version): fix null pointer exception when copy version

https://zanata.atlassian.net/browse/ZNTA-1001
https://zanata.atlassian.net/browse/ZNTA-959


  Commit: 0ee7b9cef076c2f298259e50725c09e7a32d3d17
      https://github.com/zanata/zanata-server/commit/0ee7b9cef076c2f298259e50725c09e7a32d3d17
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

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

  Log Message:
  -----------
  test: back-port document.storage.directory change (#1136)


  Commit: f949072071f794e10d020f65a820abb5ed036f46
      https://github.com/zanata/zanata-server/commit/f949072071f794e10d020f65a820abb5ed036f46
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

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

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


  Commit: 6baa33d28db85209d67ab83e3a70775bae8e3957
      https://github.com/zanata/zanata-server/commit/6baa33d28db85209d67ab83e3a70775bae8e3957
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

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

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


Compare: https://github.com/zanata/zanata-server/compare/665863460456...6baa33d28db8


More information about the zanata-commits mailing list