[zanata/zanata-server] 5540fa: Merge branch 'integration/master' into ZNTA-555-us...

[GitHub]

  Branch: refs/heads/ZNTA-555-user-request
  Home:   https://github.com/zanata/zanata-server
  Commit: 5540fa7f5ec482e294a3f5e918ef3c9c2753a4c9
      https://github.com/zanata/zanata-server/commit/5540fa7f5ec482e294a3f5e918ef3c9c2753a4c9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 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
    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/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    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/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.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 frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M mkdocs.yml
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    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/language/language.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-555-user-request