[zanata/zanata-platform] 3d208c: feat(ZNTA-2544) Download user information button a...

GitHub noreply at github.com
Mon Jun 25 22:24:11 UTC 2018 

  Branch: refs/heads/ZNTA-2544
  Home:   https://github.com/zanata/zanata-platform
  Commit: 3d208c267283f6fce84d269f0c9bfa7fd301aaae
      https://github.com/zanata/zanata-platform/commit/3d208c267283f6fce84d269f0c9bfa7fd301aaae
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  feat(ZNTA-2544) Download user information button added to profile


  Commit: 948816d2317b0af429aa7a82913a386fd7ade633
      https://github.com/zanata/zanata-platform/commit/948816d2317b0af429aa7a82913a386fd7ade633
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  feat(ZNTA-2544) Fix linting error


  Commit: dc033fd2f09cd156480dfc805e5e0254cdf05720
      https://github.com/zanata/zanata-platform/commit/dc033fd2f09cd156480dfc805e5e0254cdf05720
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  feat(ZNTA-2544) Fix linting error


  Commit: 9ca82a6c9afe98997979df9e51c7707dc2cf017a
      https://github.com/zanata/zanata-platform/commit/9ca82a6c9afe98997979df9e51c7707dc2cf017a
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  feat(ZNTA-2544) button styling


  Commit: 89e0f09091df74ed9cddca62b7009f08d55e6731
      https://github.com/zanata/zanata-platform/commit/89e0f09091df74ed9cddca62b7009f08d55e6731
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Add 'Export user data' button to profile


  Commit: c0529cc05a58fcb7a416a867a053b7c182eeed0d
      https://github.com/zanata/zanata-platform/commit/c0529cc05a58fcb7a416a867a053b7c182eeed0d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

  Log Message:
  -----------
  Add GraphQL


  Commit: 585aff745a34867060e688f7fdb967637152b5ad
      https://github.com/zanata/zanata-platform/commit/585aff745a34867060e688f7fdb967637152b5ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt
    R server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/util/json.kt
    A server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt
    R server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java

  Log Message:
  -----------
  Complete initial version of ExportRestService

Add HPerson.projectLocaleMemberships
Eliminate some cases of GraphQLIgnore
Override GraphQL type names for "H" entities
Add scalar type defs for LocaleId and ContentType
Rename GraphQLRestService to ExportRestService
Convert to Kotlin
Split up tests for ExportRestService and GraphQLService
Replace DBUnit in test with bespoke entities
Extract GraphQL 'data' for ExportRestService response
Return data as JSON
Change REST path for exporting user data
Add project/locale memberships to user data export


  Commit: 275a24a45f1029451d4805df1867d1bafe20863b
      https://github.com/zanata/zanata-platform/commit/275a24a45f1029451d4805df1867d1bafe20863b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  Add export/userData link to button


  Commit: 44f6d5e18f70a999ef8948ebbd1d320bafc76070
      https://github.com/zanata/zanata-platform/commit/44f6d5e18f70a999ef8948ebbd1d320bafc76070
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Update ASM to fix upper bound dependencies error


  Commit: 5530984e39a7a078923ced2922df1f9686cbade3
      https://github.com/zanata/zanata-platform/commit/5530984e39a7a078923ced2922df1f9686cbade3
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/util/json.kt
    A server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java

  Log Message:
  -----------
  feat(ZNTA-2544) fix merge conflict


  Commit: 4f68541a501e3f2daff1a647af0ffca6a454aac4
      https://github.com/zanata/zanata-platform/commit/4f68541a501e3f2daff1a647af0ffca6a454aac4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt

  Log Message:
  -----------
  Add 'enabled' to user data export


  Commit: e450d8bb2c6c5dfa4eb4821cc950ac644fb59510
      https://github.com/zanata/zanata-platform/commit/e450d8bb2c6c5dfa4eb4821cc950ac644fb59510
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt

  Log Message:
  -----------
  Add more assertions to ExportRestServiceTest


  Commit: 3e0ceb7eb68505a0435aee047df3f8af468f7cee
      https://github.com/zanata/zanata-platform/commit/3e0ceb7eb68505a0435aee047df3f8af468f7cee
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt
    M server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt

  Log Message:
  -----------
  Merge branch 'ZNTA-2544' of https://github.com/zanata/zanata-platform into ZNTA-2544


  Commit: ad87d02b6bc44f6f7fd06bbac2fd6e25d9ac87ef
      https://github.com/zanata/zanata-platform/commit/ad87d02b6bc44f6f7fd06bbac2fd6e25d9ac87ef
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Update animal-sniffer to support module-info.class


  Commit: 717b53ad1bd9501ffdb829f2da2308e606db51ed
      https://github.com/zanata/zanata-platform/commit/717b53ad1bd9501ffdb829f2da2308e606db51ed
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/GraphQLService.java

  Log Message:
  -----------
  Ensure CDI proxy constructor is non-private


  Commit: 68d89486ca14366ab908fffc797ebfc0aeb8372e
      https://github.com/zanata/zanata-platform/commit/68d89486ca14366ab908fffc797ebfc0aeb8372e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    R server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    R server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt

  Log Message:
  -----------
  Avoid non-compliant package name *.graphQL


  Commit: f970ff7057a1a1d3e2343f08362edf78347c2adb
      https://github.com/zanata/zanata-platform/commit/f970ff7057a1a1d3e2343f08362edf78347c2adb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Update duplicate-finder to support module-info.class


  Commit: 9f8fe79fcb58058b74b77e62197267367e418053
      https://github.com/zanata/zanata-platform/commit/9f8fe79fcb58058b74b77e62197267367e418053
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Remove 'Export user data' button from frontend


  Commit: fb1b25a57cb773a1b3cd371b71d4548861157524
      https://github.com/zanata/zanata-platform/commit/fb1b25a57cb773a1b3cd371b71d4548861157524
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  Remove unused import


  Commit: 996309826a30443328b802fc2af11fb262b674bd
      https://github.com/zanata/zanata-platform/commit/996309826a30443328b802fc2af11fb262b674bd
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  move export user data [json] button to dashboard


  Commit: 3e622ebde17f0c4a2242d2b7563691c4498ce6be
      https://github.com/zanata/zanata-platform/commit/3e622ebde17f0c4a2242d2b7563691c4498ce6be
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java

  Log Message:
  -----------
  Eliminate Guava Beta API usage


  Commit: 035c8ff6f6c1ea2cd0bbe8a3d8853f49da0c2fc3
      https://github.com/zanata/zanata-platform/commit/035c8ff6f6c1ea2cd0bbe8a3d8853f49da0c2fc3
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M parent/pom.xml
    R server/services/src/main/java/org/zanata/rest/graphQL/ExportRestService.kt
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    R server/services/src/test/java/org/zanata/rest/graphQL/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java

  Log Message:
  -----------
  feat(ZNTA-2544) fix merge conflict


  Commit: dd127015fa5bd5d7b6a0e416974ba9356f7fe6cf
      https://github.com/zanata/zanata-platform/commit/dd127015fa5bd5d7b6a0e416974ba9356f7fe6cf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt

  Log Message:
  -----------
  Fix intermittent unit test


  Commit: a6511f54374d7bf253a7f675419f16727e50fbe3
      https://github.com/zanata/zanata-platform/commit/a6511f54374d7bf253a7f675419f16727e50fbe3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Move export userData to settings/account


  Commit: a4a16a2ba5198f149628279401c5d7afa293be59
      https://github.com/zanata/zanata-platform/commit/a4a16a2ba5198f149628279401c5d7afa293be59
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt

  Log Message:
  -----------
  Add functional test for export user data


  Commit: 9eff52cd2fd6112436fd1c71009cdf26dc8c3047
      https://github.com/zanata/zanata-platform/commit/9eff52cd2fd6112436fd1c71009cdf26dc8c3047
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  feat(ZNTA-2544) update styling of Export User Data [json] button


  Commit: 97d762e14571927f6ad2b62cd8c284e52108824e
      https://github.com/zanata/zanata-platform/commit/97d762e14571927f6ad2b62cd8c284e52108824e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M docs/release-notes.md
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  fix merge conflicts


  Commit: 0d8e4765ba3d7032d47c5cd82dc560b8ebed6264
      https://github.com/zanata/zanata-platform/commit/0d8e4765ba3d7032d47c5cd82dc560b8ebed6264
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  feat(ZNTA-2544) remove duplicate button from dashboard settings


Compare: https://github.com/zanata/zanata-platform/compare/f4da8ce4ed10...0d8e4765ba3d
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

More information about the zanata-commits mailing list