Branch: refs/heads/validate-glossary-entry/ZNTA-2606
  Home:   https://github.com/zanata/zanata-platform
  Commit: 2d32f4d589d88eb25f9f34ce060098cceb81d41f
      
https://github.com/zanata/zanata-platform/commit/2d32f4d589d88eb25f9f34ce060098cceb81d41f
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): development version is now 4.6.0-SNAPSHOT


  Commit: 35156bd238206890f288bb4f70a89cd2a4ae9106
      
https://github.com/zanata/zanata-platform/commit/35156bd238206890f288bb4f70a89cd2a4ae9106
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2554): remove ant design badge component (#831)

* fix(ZNTA-2554): remove ant design badge component

* style: override new-zanata global modal styles


  Commit: 6eecd8c531216584eb96100cb7e1575167a386a2
      
https://github.com/zanata/zanata-platform/commit/6eecd8c531216584eb96100cb7e1575167a386a2
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M 
server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M 
server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M 
server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M 
server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  test(ZNTA-2555): fix assertion descriptions (#836)

* Fix assertion descriptions with structural replace
* Add back comment (was in middle of expression)


  Commit: 0a8e9429ccf6142ff36b9c044570559f9324a88f
      
https://github.com/zanata/zanata-platform/commit/0a8e9429ccf6142ff36b9c044570559f9324a88f
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M api/pom.xml
    M client/pom.xml
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M common/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/pom.xml

  Log Message:
  -----------
  fix: version


  Commit: 8d992c2177352822d02ede4660318c8cea751bec
      
https://github.com/zanata/zanata-platform/commit/8d992c2177352822d02ede4660318c8cea751bec
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    R 
server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A 
server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt

  Log Message:
  -----------
  Merge commit 'b7ffc797cc89b2b26feff4aa9619f9445093111b' into HEAD


  Commit: 0a127bf15d40f4b229901e6970a38d0aa83401e7
      
https://github.com/zanata/zanata-platform/commit/0a127bf15d40f4b229901e6970a38d0aa83401e7
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M 
server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt

  Log Message:
  -----------
  Merge commit '0dd047fe5d4aa8bad81a4baf6b27a55b40e50510' into HEAD


  Commit: 06d4120e6e74cdc71415c96a29459902061c21c0
      
https://github.com/zanata/zanata-platform/commit/06d4120e6e74cdc71415c96a29459902061c21c0
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml

  Log Message:
  -----------
  Merge commit '26ef880cfebb11816ec8749245e02c02e773c51c' into HEAD


  Commit: b3b2f6e90a049e805e17569d8f0a4603f35f1620
      
https://github.com/zanata/zanata-platform/commit/b3b2f6e90a049e805e17569d8f0a4603f35f1620
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  Merge commit 'b5fa117265f7e500aedaf3409e9ef47d3c4cfce6' into HEAD


  Commit: b4990a20789466cb3379bd9c46b49a17475bed2d
      
https://github.com/zanata/zanata-platform/commit/b4990a20789466cb3379bd9c46b49a17475bed2d
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml

  Log Message:
  -----------
  Merge commit '104f689acf7a0a931da46aea9fcdcd52417f99ae' into HEAD


  Commit: 1ce904aebb049f191a6054590d7959d8c86566fb
      
https://github.com/zanata/zanata-platform/commit/1ce904aebb049f191a6054590d7959d8c86566fb
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java

  Log Message:
  -----------
  Improve TraceDebugFilter; add debug for FileResourceClientTest (#844)

* Improve TraceDebugFilter
* Add more debugging to FileResourceClientTest
* Update help for --log-http


  Commit: f992d7518ed2b5cac5c632d3dc3e267acedfc94c
      
https://github.com/zanata/zanata-platform/commit/f992d7518ed2b5cac5c632d3dc3e267acedfc94c
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Merge commit '36047b59d30ecc90300721f33d44cb7e0950f74b' into HEAD


  Commit: 3f9d166b9d49b321109c52613326bca8109ff29c
      
https://github.com/zanata/zanata-platform/commit/3f9d166b9d49b321109c52613326bca8109ff29c
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-27 (Sun, 27 May 2018)

  Changed paths:
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge commit 'c6f3d7db746939acd26afc2de128daed07f78f51' into HEAD


  Commit: ad1b94c221c143206683885cadb552290b87ba19
      
https://github.com/zanata/zanata-platform/commit/ad1b94c221c143206683885cadb552290b87ba19
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  fix(ZNTA-2574) group pages: language dropdown height corrected, container 
width corrected


  Commit: 2f5c1a763faa36dc916a37d788b215d2adb2a2b5
      
https://github.com/zanata/zanata-platform/commit/2f5c1a763faa36dc916a37d788b215d2adb2a2b5
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M 
server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml

  Log Message:
  -----------
  fix: unique html id for checkbox (#848)

https://zanata.atlassian.net/browse/ZNTA-2549


  Commit: a9ab63ba4c698666d0d27fbeeca8cbebc0ff9c6e
      
https://github.com/zanata/zanata-platform/commit/a9ab63ba4c698666d0d27fbeeca8cbebc0ff9c6e
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  fix(ZNTA-2574) dashboard: improve line height of page titles


  Commit: e06be62d5380bc54d789b8647d624c60d342bc4c
      
https://github.com/zanata/zanata-platform/commit/e06be62d5380bc54d789b8647d624c60d342bc4c
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Log Message:
  -----------
  Merge commit 'e9f9ed7ca8c0b5ecc417cf76c42d7b0a9639af6d' into HEAD


  Commit: 49eee03e205799d3f9ae596d6e4da047ac9374b3
      
https://github.com/zanata/zanata-platform/commit/49eee03e205799d3f9ae596d6e4da047ac9374b3
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/services/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  Update JavaMelody to 1.72.0 (#847)


  Commit: 31f5b60c1bb8260a85f6bd61a3bcb7cfe6dc4a2b
      
https://github.com/zanata/zanata-platform/commit/31f5b60c1bb8260a85f6bd61a3bcb7cfe6dc4a2b
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  Merge pull request #850 from zanata/ZNTA-2574

fix(ZNTA-2574) group pages styling fixes


  Commit: 1e7906e35a068564495edb4414602752aa4cc4e0
      
https://github.com/zanata/zanata-platform/commit/1e7906e35a068564495edb4414602752aa4cc4e0
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/functional-test/pom.xml
    A server/functional-test/src/test/resources/liquibase.properties

  Log Message:
  -----------
  Merge commit 'efe7df35a4c2d892d87eb0273c787f390db8f802' into HEAD


  Commit: a67c52034b216b5cbd83ae688b9aa95b0719cc32
      
https://github.com/zanata/zanata-platform/commit/a67c52034b216b5cbd83ae688b9aa95b0719cc32
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into release-fix-may18


  Commit: d2c8ae43308fcb41489698b15fc7ee6f901367d7
      
https://github.com/zanata/zanata-platform/commit/d2c8ae43308fcb41489698b15fc7ee6f901367d7
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M 
server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  feat: display projects in dashboard for member and maintainer (#852)

https://zanata.atlassian.net/browse/ZNTA-2578


  Commit: a5b65fbd09527c9e6476170286871e0439e3b330
      
https://github.com/zanata/zanata-platform/commit/a5b65fbd09527c9e6476170286871e0439e3b330
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  Merge pull request #857 from zanata/release-fix-may18

fix: release-to-master merge conflicts


  Commit: ed6c2a456743fd1d5f4baf8b1d677cd8e9389d8f
      
https://github.com/zanata/zanata-platform/commit/ed6c2a456743fd1d5f4baf8b1d677cd8e9389d8f
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M 
server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js

  Log Message:
  -----------
  fix(ZNTA-2587): mock ant design buttons, re-enable storyshot tests (#821)

* fix: mock ant design buttons, re-enable storyshot tests

* fix: move ant button mock to storyshots-editor and storyshots-frontend test 
files


  Commit: 19323098342895579ff6e31332dd3ebfad2c7ea4
      
https://github.com/zanata/zanata-platform/commit/19323098342895579ff6e31332dd3ebfad2c7ea4
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js

  Log Message:
  -----------
  refactor(ZNTA-2584): EditorSearchInput to use Ant Collapse (#856)

* refactor: EditorSearchInput to use Ant Collapse

* test: update EditorSearchInput test to reflect changes


  Commit: db3978a9c7ee5a41d0c53e4374bc1088413245fa
      
https://github.com/zanata/zanata-platform/commit/db3978a9c7ee5a41d0c53e4374bc1088413245fa
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M 
server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2538): RejectionsForm bootstap components to ant design (#817)

* refactor: RejectionsForm bootstap components to ant design

* refactor(ZNTA-2538) css styling for RejectionsForm

* chore: update RejectionsForm storybook

* fix: Comment Required Switch

* fix: button tooltip behaviour

* fix: setState infinite loop, use ant components in Review controller


  Commit: b005043042702f5805f4cb1d5bbbf020e3d29af0
      
https://github.com/zanata/zanata-platform/commit/b005043042702f5805f4cb1d5bbbf020e3d29af0
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav icons


  Commit: b74d28db884414e6f4e7cdb03a4edaca7f13b2d7
      
https://github.com/zanata/zanata-platform/commit/b74d28db884414e6f4e7cdb03a4edaca7f13b2d7
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M 
server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java

  Log Message:
  -----------
  Use waitForPageSilence, not Thread.sleep (#832)


  Commit: 4760f8f00e6d623c15625fdbb3c854a5ae4b76b7
      
https://github.com/zanata/zanata-platform/commit/4760f8f00e6d623c15625fdbb3c854a5ae4b76b7
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M 
server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M 
server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java

  Log Message:
  -----------
  fix: cleanup obsolete groups (#859)

https://zanata.atlassian.net/browse/ZNTA-2588


  Commit: 79e359d6a8433697726f0c046f137e08f7510972
      
https://github.com/zanata/zanata-platform/commit/79e359d6a8433697726f0c046f137e08f7510972
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    M 
server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M 
server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  Merge commit '3fbc165258165eea88d786f589eda95444abf5a1' into HEAD


  Commit: 66541d86ead50561ff6edc2cd588d33ebbc33383
      
https://github.com/zanata/zanata-platform/commit/66541d86ead50561ff6edc2cd588d33ebbc33383
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2591) remove extra width given to wideView containers


  Commit: 37b390dfe272b43e1a555796d87e29f310da83cd
      
https://github.com/zanata/zanata-platform/commit/37b390dfe272b43e1a555796d87e29f310da83cd
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M docs/user-guide/documents/upload-documents.md
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M 
server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

  Log Message:
  -----------
  Merge commit '4874eddb742f65244cbac5f3adb4adfbb10d969a' into HEAD


  Commit: fb37a94b7431c96f06eb49a7940a878bbfc0db7d
      
https://github.com/zanata/zanata-platform/commit/fb37a94b7431c96f06eb49a7940a878bbfc0db7d
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js

  Log Message:
  -----------
  Merge commit '3aa751ed169093b96a3eae79ce7761667135ba77' into HEAD


  Commit: d75e1a636956e65821ddc657a2ed68939c90f9a1
      
https://github.com/zanata/zanata-platform/commit/d75e1a636956e65821ddc657a2ed68939c90f9a1
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  Merge commit '8932a194983bafb3d83a944c8d2c89c2752c18e8' into HEAD


  Commit: 02b17eab9d48120d7d5daa60e620c34344a849cc
      
https://github.com/zanata/zanata-platform/commit/02b17eab9d48120d7d5daa60e620c34344a849cc
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Merge commit 'a63bcefe1efb734947c5b285b6b07705b1e517fb' into HEAD


  Commit: 0520d6b72e3e9a75f1a0764a1bafad53078e2933
      
https://github.com/zanata/zanata-platform/commit/0520d6b72e3e9a75f1a0764a1bafad53078e2933
  Author: Dragos Varovici <dvarovici.w...@gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    A api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    A 
server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Min content state when retrieving translations (approved or 
translated)


  Commit: a913c676a9f12541f7e44ccc21c50c46db540289
      
https://github.com/zanata/zanata-platform/commit/a913c676a9f12541f7e44ccc21c50c46db540289
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Make dbunit tests easier to understand

Add more explanations to ProjectDAOTest
Move constants for ProjectsData.dbunit.xml
Add ContentState guide to MultipleTextFlowTestData.dbunit.xml


  Commit: 17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
      
https://github.com/zanata/zanata-platform/commit/17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
  Author: Dragos Varovici <dvarovici.w...@gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    R api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A 
server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    R 
server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  feat(ZNTA-2437) Code review changes and refactoring

Changes/Refactorings based on the code review
Removing code duplicates


  Commit: af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
      
https://github.com/zanata/zanata-platform/commit/af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore

  Log Message:
  -----------
  Update .gitignore


  Commit: 48db1f267786e7963cb885030c9f7121a2a373b2
      
https://github.com/zanata/zanata-platform/commit/48db1f267786e7963cb885030c9f7121a2a373b2
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-po/pom.xml
    M 
common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M 
common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M 
common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M 
server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    R 
server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M 
server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    R 
server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    R 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    R 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437): replace minContentState options with approvedOnly

FileResource/Service: change minContentState to approvedOnly
TranslatedDocResource: change minContentState to markTranslatedAsApproved
Refactor MinContentStateRestITCase: bring in constants for test data
Rename MinContentStateRestITCase to TranslationResourceApprovedRestITCase
Refactor FileRawRestITCase; add test which downloads XLIFF source
Add approvedOnly option to CLI, PoWriter2, XliffWriter and PropWriter
Add approvedOnly unit tests for XliffWriter and PropWriter
Refactor PoReader2Test
Refactor PoWriter2 to add Builder
Add unit tests for PoWriter2


  Commit: fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
      
https://github.com/zanata/zanata-platform/commit/fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M parent/pom.xml

  Log Message:
  -----------
  Use slf4j-simple in common modules


  Commit: 0834f07b0a574609ea5c220da20506d97191a417
      
https://github.com/zanata/zanata-platform/commit/0834f07b0a574609ea5c220da20506d97191a417
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

  Log Message:
  -----------
  Merge commit 'd7b7fe3772227cc8a1196c0e6b17bc23ef83f7c4' into HEAD


  Commit: 12290b80188520b12a02b6b62b014c626f42fd85
      
https://github.com/zanata/zanata-platform/commit/12290b80188520b12a02b6b62b014c626f42fd85
  Author: Dragos Varovici <dvarovici.w...@gmail.com>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

  Changed paths:
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Code review fixes
FileResource: parameter documentation change
FileRawRestITCase: checking the resource
TranslationResourceRestITCase: removing duplicates


  Commit: 6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
      
https://github.com/zanata/zanata-platform/commit/6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Configure compiler to fail on warning


  Commit: 9840852c0effb613b2fe36c48b710a1cffc55a9e
      
https://github.com/zanata/zanata-platform/commit/9840852c0effb613b2fe36c48b710a1cffc55a9e
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java

  Log Message:
  -----------
  Make log msg less like a javac warning


  Commit: 17a689dc2f4b3d90028bd2b03fba297ca5ae493b
      
https://github.com/zanata/zanata-platform/commit/17a689dc2f4b3d90028bd2b03fba297ca5ae493b
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M server/pom.xml

  Log Message:
  -----------
  Fail on Kotlin warnings (#869)


  Commit: 17367257b395193eb4513aaf3000ae0b49a3ea4f
      
https://github.com/zanata/zanata-platform/commit/17367257b395193eb4513aaf3000ae0b49a3ea4f
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M server/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into min-content-state


  Commit: f4f3b5e8425f80de5507b171da7fc17423607ec7
      
https://github.com/zanata/zanata-platform/commit/f4f3b5e8425f80de5507b171da7fc17423607ec7
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge commit '220a1beffff1b665b9f1a382930168f8baf6cc1e' into HEAD


  Commit: 40b1dc3648841a820dcabd98333e7ad0980b7619
      
https://github.com/zanata/zanata-platform/commit/40b1dc3648841a820dcabd98333e7ad0980b7619
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  Merge commit 'a6cf4a2fcb14d535bdeb6e6cc2f5fda520b104b0' into HEAD


  Commit: 1825b803dcd24a43041afcb29c8627294e7ae879
      
https://github.com/zanata/zanata-platform/commit/1825b803dcd24a43041afcb29c8627294e7ae879
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '5ea641e859f060c75920cf12d20e5b7aad23ee8f' into HEAD


  Commit: c6a74500adbe29650c589eddd826515db061c874
      
https://github.com/zanata/zanata-platform/commit/c6a74500adbe29650c589eddd826515db061c874
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Log Message:
  -----------
  Merge branch 'release'


  Commit: b490718d676fd0fe205cf5d6459531428a1af59c
      
https://github.com/zanata/zanata-platform/commit/b490718d676fd0fe205cf5d6459531428a1af59c
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  fix: improve stats collection (#872)

https://zanata.atlassian.net/browse/ZNTA-968


  Commit: 52a0b4e91426e30eeb02cb5b97a64b064f7d4f07
      
https://github.com/zanata/zanata-platform/commit/52a0b4e91426e30eeb02cb5b97a64b064f7d4f07
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    R docs/images/version-translation-settings.png
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M 
server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/messages.properties
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M 
server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix: remove requireReview flag (#874)

https://zanata.atlassian.net/browse/ZNTA-2599


  Commit: db3327e5c915b3555604175cb029fa96ff1e199f
      
https://github.com/zanata/zanata-platform/commit/db3327e5c915b3555604175cb029fa96ff1e199f
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M 
server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M 
server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf

  Log Message:
  -----------
  Fix approvedOnly handling in adapters, add more tests

Also fix ZNTA-2601: in .TS, only use type=unfinished when appropriate


  Commit: bdef4f576130f72a95a0286ae8498b379e10f74b
      
https://github.com/zanata/zanata-platform/commit/bdef4f576130f72a95a0286ae8498b379e10f74b
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-06 (Wed, 06 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css

  Log Message:
  -----------
  Merge commit '9610a5e9223f6799cf6f6a5b2927ef8388dbe5bd' into HEAD


  Commit: 58c3eb03d9b65c332db42a7c7be8af56c72b146a
      
https://github.com/zanata/zanata-platform/commit/58c3eb03d9b65c332db42a7c7be8af56c72b146a
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2591) remove extra width from react containers, remove background 
colour added by antd to react-autosuggest input component


  Commit: a1e8aac6075d76f84783b6dc817aa4e795bc9656
      
https://github.com/zanata/zanata-platform/commit/a1e8aac6075d76f84783b6dc817aa4e795bc9656
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2591) remove wideView wrapper from languages page


  Commit: 9b255246411afb4c806a3db835dd04995b54ddc6
      
https://github.com/zanata/zanata-platform/commit/9b255246411afb4c806a3db835dd04995b54ddc6
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M 
server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Enable strictNullChecks for TypeScript (#880)


  Commit: 4f5b384712c106cff09e47e96f74f7f9118eb376
      
https://github.com/zanata/zanata-platform/commit/4f5b384712c106cff09e47e96f74f7f9118eb376
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js

  Log Message:
  -----------
  Merge commit '946013fab8d80da095d8a3ce0cb0f13dfbe05cea' into HEAD


  Commit: b80ea0111d4b95d6c805f7aa63bc3a039fe4c9bd
      
https://github.com/zanata/zanata-platform/commit/b80ea0111d4b95d6c805f7aa63bc3a039fe4c9bd
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml

  Log Message:
  -----------
  fix(ZNTA-2614) increase contrast of concurrent editor username in gwt editor


  Commit: 1f651a313bdcc6ba601661cdffccaa53b00f5600
      
https://github.com/zanata/zanata-platform/commit/1f651a313bdcc6ba601661cdffccaa53b00f5600
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java

  Log Message:
  -----------
  fix: GWT editor option (#890)

https://zanata.atlassian.net/browse/ZNTA-2618


  Commit: 937493a87eab71377333302d1ae3cb5c7847b6b8
      
https://github.com/zanata/zanata-platform/commit/937493a87eab71377333302d1ae3cb5c7847b6b8
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java

  Log Message:
  -----------
  Merge commit '1f651a313bdcc6ba601661cdffccaa53b00f5600' into HEAD


  Commit: f6790b9236fb74f09d844f9932d70a8383dc2ef2
      
https://github.com/zanata/zanata-platform/commit/f6790b9236fb74f09d844f9932d70a8383dc2ef2
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml

  Log Message:
  -----------
  Merge pull request #889 from zanata/ZNTA-2614

fix(ZNTA-2614) increase contrast of concurrent editor username in gwt editor


  Commit: e20ce80029ab41744adc5bf34c0a4b8aa61b4a6d
      
https://github.com/zanata/zanata-platform/commit/e20ce80029ab41744adc5bf34c0a4b8aa61b4a6d
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #868 from zanata/ZNTA-2591

fix(ZNTA-2591) remove extra width and height from languages page + minor 
styling fixes


  Commit: 2e866d0dd10d43c418cc2f7dba4cd0dec93be8fd
      
https://github.com/zanata/zanata-platform/commit/2e866d0dd10d43c418cc2f7dba4cd0dec93be8fd
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx

  Log Message:
  -----------
  fix: hide activity commentbox when no translations to comment on (#883)


  Commit: df85c9a3cf1f89396739d76e016606c110b7269f
      
https://github.com/zanata/zanata-platform/commit/df85c9a3cf1f89396739d76e016606c110b7269f
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js

  Log Message:
  -----------
  fix(ZNTA-2608): reset new language form fields on close or submit (#885)


  Commit: d5abeda17b8ba0f66c426d295734f96693c9db4b
      
https://github.com/zanata/zanata-platform/commit/d5abeda17b8ba0f66c426d295734f96693c9db4b
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less

  Log Message:
  -----------
  fix(ZNTA-2589) set fixed width and height on logoloader to ensure nav icons 
are same size across frontend


  Commit: cffd08113a19ca90b7c57551d07ea815feeae955
      
https://github.com/zanata/zanata-platform/commit/cffd08113a19ca90b7c57551d07ea815feeae955
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2589) ensure antd dropdowns have a white/transparent background for 
visibility


  Commit: 5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
      
https://github.com/zanata/zanata-platform/commit/5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-nav.less

  Log Message:
  -----------
  fix(ZNTA-2589) WIP: nav-icon size


  Commit: 9f6d01c1f7cd85a3fae89661d8783df87538ca60
      
https://github.com/zanata/zanata-platform/commit/9f6d01c1f7cd85a3fae89661d8783df87538ca60
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-nav.less

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav-icon size across react and jsf pages


  Commit: 658f15710c1df388ca997378442c8b89756d8d78
      
https://github.com/zanata/zanata-platform/commit/658f15710c1df388ca997378442c8b89756d8d78
  Author: efloden <eflo...@redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'release' of github.com:zanata/zanata-platform into 
merge-release-master


  Commit: c31c76d6f8d802417b83f13883a142fd948e44b2
      
https://github.com/zanata/zanata-platform/commit/c31c76d6f8d802417b83f13883a142fd948e44b2
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml

  Log Message:
  -----------
  Hide translation-comment search (can't show/edit) (#892)


  Commit: 02757d8717bba2f8ef5665075fb12b6203744ae1
      
https://github.com/zanata/zanata-platform/commit/02757d8717bba2f8ef5665075fb12b6203744ae1
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R 
server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M 
server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js

  Log Message:
  -----------
  feat(ZNTA-2528): refactor to ant notifications and alerts (#875)

* feat(ZNTA-2528): refactor to ant notifications and alerts

* chore: remove bootstrap notification story, snapshots

* refactor: bootstrap Alert to Ant Notification

* refactor: match notification props with ant component

* chore: update reducer tests


  Commit: c0181625c53ea012218fcd6467e4b305e6e9d541
      
https://github.com/zanata/zanata-platform/commit/c0181625c53ea012218fcd6467e4b305e6e9d541
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M 
server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js

  Log Message:
  -----------
  fix: statistics update after save (#888)

https://zanata.atlassian.net/browse/ZNTA-2616


  Commit: 5572692dd39b47b709920763867870b962fbc8cd
      
https://github.com/zanata/zanata-platform/commit/5572692dd39b47b709920763867870b962fbc8cd
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling


  Commit: 963fe462d20398bc471e0eb750ecf70a6443e9fc
      
https://github.com/zanata/zanata-platform/commit/963fe462d20398bc471e0eb750ecf70a6443e9fc
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling


  Commit: ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
      
https://github.com/zanata/zanata-platform/commit/ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.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

  Log Message:
  -----------
  fix(ZNTA-2607) TMX modal styling


  Commit: 1a7a59b75c0c99659ae58ed9f99ca98888b68605
      
https://github.com/zanata/zanata-platform/commit/1a7a59b75c0c99659ae58ed9f99ca98888b68605
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #893 from zanata/merge-release-master

merge release into master


  Commit: 925b2778b593c91f050d09b8f0a8cf772e3130a7
      
https://github.com/zanata/zanata-platform/commit/925b2778b593c91f050d09b8f0a8cf772e3130a7
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js

  Log Message:
  -----------
  fix(ZNTA-2617) add spacing to delete entry buttons on language page, fix 
alignment of no languages statement (#887)


  Commit: 2c5ccfe355ee10c7b7cb11162a14a1d6cb307aee
      
https://github.com/zanata/zanata-platform/commit/2c5ccfe355ee10c7b7cb11162a14a1d6cb307aee
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M 
server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js

  Log Message:
  -----------
  Merge commit '925b2778b593c91f050d09b8f0a8cf772e3130a7' into HEAD


  Commit: c98bd78d0e445723e4b9601a28bb92c842f5c1ec
      
https://github.com/zanata/zanata-platform/commit/c98bd78d0e445723e4b9601a28bb92c842f5c1ec
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/src/test/java/TestJenkinsfile.java

  Log Message:
  -----------
  chore(ZNTA-2390): run all tests if PR description contains allFuncTests (#846)


  Commit: 9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
      
https://github.com/zanata/zanata-platform/commit/9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/index.html

  Log Message:
  -----------
  fix: js warning in frontend (#897)


  Commit: c287e55a8548ab961c5fb06a5e88fc90490963dd
      
https://github.com/zanata/zanata-platform/commit/c287e55a8548ab961c5fb06a5e88fc90490963dd
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  fix(ZNTA-2532) fix liquibase configuration (#853)

* Test: ensure build fails if liquibase does
* Configure liquibase and appserver to use basedir/target/documents
* Download mysql/slf4j if required


  Commit: 2c10d4f295f111fb19c2f842c57b1519509e46d5
      
https://github.com/zanata/zanata-platform/commit/2c10d4f295f111fb19c2f842c57b1519509e46d5
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  Merge commit 'c287e55a8548ab961c5fb06a5e88fc90490963dd' into HEAD


  Commit: 92fb27d10ff41c083d7d553161de66ed2e1cc4fc
      
https://github.com/zanata/zanata-platform/commit/92fb27d10ff41c083d7d553161de66ed2e1cc4fc
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M 
common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M 
common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M 
common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M 
server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M 
server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M 
server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M 
server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A 
server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge pull request #834 from dragosv/min-content-state

feat(ZNTA-2437) add option to get Approved translations only


  Commit: d7c7d1eb627c09015dd7e6dd4c125aab416cd518
      
https://github.com/zanata/zanata-platform/commit/d7c7d1eb627c09015dd7e6dd4c125aab416cd518
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java

  Log Message:
  -----------
  Add some missing assertions (#835)

* Add some missing assertions
* Remove useless assertThat calls


  Commit: 13ec976997819c3165f89c2101c2535b68f34778
      
https://github.com/zanata/zanata-platform/commit/13ec976997819c3165f89c2101c2535b68f34778
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  Merge pull request #894 from zanata/ZNTA-2620

fix(ZNTA-2620) user profile button styling


  Commit: c4b90fb52254de18a056aca3ecea146ae742f27a
      
https://github.com/zanata/zanata-platform/commit/c4b90fb52254de18a056aca3ecea146ae742f27a
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '13ec976997819c3165f89c2101c2535b68f34778' into HEAD


  Commit: c28c34cf09acab475f1e0acfcbd145be160d50eb
      
https://github.com/zanata/zanata-platform/commit/c28c34cf09acab475f1e0acfcbd145be160d50eb
  Author: Damian Jansen <djan...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M 
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

  Log Message:
  -----------
  fix(ZNTA-2605): fix contact admin on Google log in (#878)


  Commit: f433f4204ac8868cf58f1293459106fab6d10ac0
      
https://github.com/zanata/zanata-platform/commit/f433f4204ac8868cf58f1293459106fab6d10ac0
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-87): notify failed translation saves in alpha editor (#877)

* feat(ZNTA-87): notify failed translation saves in alpha editor

* fix: update individual phrase details inProgressSave

* fix: check undefined translation (saving as untranslated), show error status


  Commit: 628765e06864973e17825408dc79b7dd10719fe0
      
https://github.com/zanata/zanata-platform/commit/628765e06864973e17825408dc79b7dd10719fe0
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-war/src/main/webapp/editor/index.xhtml

  Log Message:
  -----------
  fix(ZNTA-821): alpha editor to use zanata language setting as lang attribute 
(#862)

* fix(ZNTA-821): alpha editor to use zanata language setting as html lang 
attribute

* fix: try catch unsupported locales for react-intl locale data


  Commit: e8bef20abd78c22b7773cda9be35481fee99a2cd
      
https://github.com/zanata/zanata-platform/commit/e8bef20abd78c22b7773cda9be35481fee99a2cd
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #860 from zanata/ZNTA-2589

fix(ZNTA-2589) consistency of nav icons


  Commit: 0435bf01d8aec13c2932f6f2a941d44b2f9e627c
      
https://github.com/zanata/zanata-platform/commit/0435bf01d8aec13c2932f6f2a941d44b2f9e627c
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M 
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

  Log Message:
  -----------
  Merge commit 'e8bef20abd78c22b7773cda9be35481fee99a2cd' into HEAD


  Commit: 119c0da3545e4bc05b44f7bb06d84401da7b9e0d
      
https://github.com/zanata/zanata-platform/commit/119c0da3545e4bc05b44f7bb06d84401da7b9e0d
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.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

  Log Message:
  -----------
  Merge pull request #895 from zanata/ZNTA-2607-release

fix(ZNTA-2607) TMX modal styling


  Commit: 7003ea99e4915070427273c7bb06fed7a7b55ede
      
https://github.com/zanata/zanata-platform/commit/7003ea99e4915070427273c7bb06fed7a7b55ede
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.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

  Log Message:
  -----------
  fix: resolve merge conflicts, minor changes to TMX modal styling


  Commit: 3dfa7ffd1ba8208553e9dcb81d0227b7555b5be1
      
https://github.com/zanata/zanata-platform/commit/3dfa7ffd1ba8208553e9dcb81d0227b7555b5be1
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.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

  Log Message:
  -----------
  Merge pull request #898 from zanata/release-to-master-0618

fix release-to-master conflicts


  Commit: adbb537c564027b31fb69316513bc53f5ce4c637
      
https://github.com/zanata/zanata-platform/commit/adbb537c564027b31fb69316513bc53f5ce4c637
  Author: Alex Eng <a...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix: project url in glossary page (#901)

https://zanata.atlassian.net/browse/ZNTA-2609


  Commit: f60374455aa308be589348199154196254a850e0
      
https://github.com/zanata/zanata-platform/commit/f60374455aa308be589348199154196254a850e0
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  Merge commit 'adbb537c564027b31fb69316513bc53f5ce4c637' into HEAD


  Commit: dd15002b21db7be32bd9fd2d1a0112dc3289cbc3
      
https://github.com/zanata/zanata-platform/commit/dd15002b21db7be32bd9fd2d1a0112dc3289cbc3
  Author: Earl Floden <eflo...@redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java

  Log Message:
  -----------
  fix: AddLanguageTest selenium id for notifications (#896)


  Commit: 269f9b5f01d98650845021f042702ff98f2387d0
      
https://github.com/zanata/zanata-platform/commit/269f9b5f01d98650845021f042702ff98f2387d0
  Author: efloden <eflo...@redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/pom.xml
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/pom.xml
    M client/stub-server/pom.xml
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/pom.xml
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M 
common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M 
common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M 
common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M common/zanata-common-util/pom.xml
    R docs/images/version-translation-settings.png
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M parent/pom.xml
    M pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M 
server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M 
server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/gwt-editor/pom.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M 
server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M 
server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M 
server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M 
server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M 
server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M 
server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M 
server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M 
server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M 
server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M 
server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M 
server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M 
server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/.gitignore
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R 
server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    M 
server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M 
server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M 
server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M 
server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M 
server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    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/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M 
server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M 
server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M 
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A 
server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into 
validate-glossary-entry/ZNTA-2606


Compare: 
https://github.com/zanata/zanata-platform/compare/0711d65535df...269f9b5f01d9
      **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.
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to