[zanata/zanata-server] 306500: Merge pull request #1033 from zanata/Glossary-usab...

[GitHub]

  Branch: refs/heads/Glossary-usability
  Home:   https://github.com/zanata/zanata-server
  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: 457e06afccc7611771dda9b4cb1e3afec36f33ed
      https://github.com/zanata/zanata-server/commit/457e06afccc7611771dda9b4cb1e3afec36f33ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

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


Compare: https://github.com/zanata/zanata-server/compare/34ffb7757621...457e06afccc7