[zanata/zanata-server] 37d95f: fix(glossary):hide delete button for non-glossary ...

[GitHub]

  Branch: refs/heads/ZNTA-555-user-request
  Home:   https://github.com/zanata/zanata-server
  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: 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: 5df7ecceeea98b0e29583376125afd07a4da4abd
      https://github.com/zanata/zanata-server/commit/5df7ecceeea98b0e29583376125afd07a4da4abd
  Author: Alex Eng <aeng at redhat.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/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/requests-tab.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml

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


Compare: https://github.com/zanata/zanata-server/compare/88dd77740d8a...5df7ecceeea9