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

[GitHub]

  Branch: refs/heads/rhbz1062476-glossary-upload
  Home:   https://github.com/zanata/zanata-server
  Commit: 2dd421698afe2be1ed643386509504bb7cefe9df
      https://github.com/zanata/zanata-server/commit/2dd421698afe2be1ed643386509504bb7cefe9df
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 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


  Commit: 2126b899933abb25e62540c87241c6ec8c0c634b
      https://github.com/zanata/zanata-server/commit/2126b899933abb25e62540c87241c6ec8c0c634b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    R docs/images/project-webhooks-settings-2.png
    M docs/images/project-webhooks-settings.png
    M docs/release-notes.md
    M docs/user-guide/projects/project-settings.md
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    R zanata-war/src/main/java/org/zanata/events/JSONType.java
    A zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    A zanata-war/src/main/java/org/zanata/util/HmacUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/WebhookPublisherCallback.java
    A zanata-war/src/test/java/org/zanata/service/impl/WebhooksPublisherITCase.java
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    A zanata-war/src/test/java/org/zanata/util/HmacUtilTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1062476-glossary-upload


Compare: https://github.com/zanata/zanata-server/compare/df53ef611874...2126b899933a