[zanata/zanata-server] 0ce7ff: Merge branch 'master' into redux-app

[GitHub]

  Branch: refs/heads/redux-app
  Home:   https://github.com/zanata/zanata-server
  Commit: 0ce7ffaafee7ef69d30bd967da7047d1afe6c7c2
      https://github.com/zanata/zanata-server/commit/0ce7ffaafee7ef69d30bd967da7047d1afe6c7c2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.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 zanata-model/src/main/java/org/zanata/model/WebHook.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeTypeDescriptor.java
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.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/email/ContactLanguageTeamMembersEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/events/DocStatsEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.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/VersionStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.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/service/impl/WebHooksPublisher.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentStatsEvent.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_anp.properties
    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_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es_AR.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
    A zanata-war/src/main/resources/messages_me_ME.properties
    A zanata-war/src/main/resources/messages_mk.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
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_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-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java

  Log Message:
  -----------
  Merge branch 'master' into redux-app