[zanata/zanata-server] 988948: Merge branch 'integration/master' into list-contri...

[GitHub]

  Branch: refs/heads/list-contributors
  Home:   https://github.com/zanata/zanata-server
  Commit: 988948186f8498af26408b430c0ed4157c79343a
      https://github.com/zanata/zanata-server/commit/988948186f8498af26408b430c0ed4157c79343a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/glossary/delete-glossaries.md
    M frontend/pom.xml
    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/GlossaryAPIStore.js
    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 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
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    R zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.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/rest/service/StatisticsServiceImpl.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/service/impl/TranslationServiceImpl.java
    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-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    R zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata.xml

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