[zanata/zanata-server] c31ffd: fix,style(glossary upload): update glossary upload...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: c31ffda6b364d2c97641d52852facffdcc69adf2
      https://github.com/zanata/zanata-server/commit/c31ffda6b364d2c97641d52852facffdcc69adf2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml

  Log Message:
  -----------
  fix,style(glossary upload): update glossary upload dialog

https://bugzilla.redhat.com/show_bug.cgi?id=1062476

https://github.com/zanata/zanata-server/pull/914

Squashed commit of the following:

commit d085bcaf18782be3fa4993e66e7a5aef4e0cccdf
Merge: 2126b89 07800cd
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 17 10:59:14 2015 +1000

    Merge branch 'integration/master' into rhbz1062476-glossary-upload

commit 2126b899933abb25e62540c87241c6ec8c0c634b
Merge: 2dd4216 bd33f08
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jul 17 09:39:24 2015 +1000

    Merge branch 'integration/master' into rhbz1062476-glossary-upload

commit 2dd421698afe2be1ed643386509504bb7cefe9df
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 16 14:24:30 2015 +1000

    fix,style(glossary upload): update glossary upload dialog