[zanata/zanata-platform] dd070d: Merge remote-tracking branch 'origin/master' into ...

[GitHub]

  Branch: refs/heads/server-split
  Home:   https://github.com/zanata/zanata-platform
  Commit: dd070da9c13a71f6a3522d1fe1d5d7c987c431d6
      https://github.com/zanata/zanata-platform/commit/dd070da9c13a71f6a3522d1fe1d5d7c987c431d6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/CopyTransStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryLocaleInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryResults.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleDetails.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/QualifiedName.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ResultList.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/VersionInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/ContainerTranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/TranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/BaseContributionStatistic.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/ContributionStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/LocaleStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/CopyTransResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    R server/services/src/main/java/org/zanata/rest/service/package-info.java
    A server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into server-split