Branch: refs/heads/ZNTA-2224
  Home:   https://github.com/zanata/zanata-platform
  Commit: 4840f0946998458b5ea2b1edaec0365176907168
      
https://github.com/zanata/zanata-platform/commit/4840f0946998458b5ea2b1edaec0365176907168
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java

  Log Message:
  -----------
  fix:allow pull without zanata.xml (#570)

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


  Commit: 798963be9ec304817b07e64c38d9fc761ebf22e5
      
https://github.com/zanata/zanata-platform/commit/798963be9ec304817b07e64c38d9fc761ebf22e5
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M 
server/services/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectLocaleMemberDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectMemberDAO.java
    M 
server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/rest/service/ETagUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/RestSlugValidator.java
    M 
server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/ui/ActivityEntry.java
    M server/services/src/main/resources/messages.properties
    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/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.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/GlossaryFileServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M server/services/src/test/java/org/zanata/ui/ActivityEntryTest.java
    M 
server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M 
server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryItemMatrix.jsx
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    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-group/projects-tab.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml

  Log Message:
  -----------
  ZNTA-2173 hide private project (#547)

* refactor: change invite only to private in project

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

* refactor: move to 4.4 db.changelog

* feat: hide private proj from explore and project page

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

* feat: hide from profile page

* feat: hide private project from activity

* feat: hide from group

* feat: limit rest and client access to private project

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

* fix: unit test

* fix security rule for reading private project


  Commit: c0217ea984573698edbe886cda7a543f6efc1213
      
https://github.com/zanata/zanata-platform/commit/c0217ea984573698edbe886cda7a543f6efc1213
  Author: kgough <kgo...@redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js

  Log Message:
  -----------
  fix(ZNTA-2224) update css classes for EditorSidebar


  Commit: 22afe156c0231a98cec06ae7d35db5c6e2c14ec7
      
https://github.com/zanata/zanata-platform/commit/22afe156c0231a98cec06ae7d35db5c6e2c14ec7
  Author: kgough <kgo...@redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/.yarn-version

  Log Message:
  -----------
  fix(ZNTA-2236) change version range for yarn


  Commit: caf9d5f57ac718eb157be519eaa832db553ba2a5
      
https://github.com/zanata/zanata-platform/commit/caf9d5f57ac718eb157be519eaa832db553ba2a5
  Author: kgough <kgo...@redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js

  Log Message:
  -----------
  fix(ZNTA-2224) fixed linting errors


  Commit: 35929750a67ed40b06a5ab7569fd5b1eeb6e13cc
      
https://github.com/zanata/zanata-platform/commit/35929750a67ed40b06a5ab7569fd5b1eeb6e13cc
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/.yarn-version

  Log Message:
  -----------
  Merge pull request #577 from zanata/ZNTA-2236-yarnfix

fix(ZNTA-2236) change version range for yarn


  Commit: 30bbe5be71b236ac357d902fcb93dd1aeff47c53
      
https://github.com/zanata/zanata-platform/commit/30bbe5be71b236ac357d902fcb93dd1aeff47c53
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M server/services/src/main/resources/messages.properties

  Log Message:
  -----------
  fix: new window for commonmark ref (#574)

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


  Commit: 74ef5327f0efa91207dfc99027953c33d08d6d22
      
https://github.com/zanata/zanata-platform/commit/74ef5327f0efa91207dfc99027953c33d08d6d22
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M 
server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M server/zanata-frontend/src/frontend/app/reducers/glossary-reducer.js

  Log Message:
  -----------
  fix: security check for private project in zanata-cli (#572)

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


  Commit: 9044abc94907de740fb8e2d199785a8c458e328e
      
https://github.com/zanata/zanata-platform/commit/9044abc94907de740fb8e2d199785a8c458e328e
  Author: Unknown <kgo...@redhat.com>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M 
server/services/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectLocaleMemberDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectMemberDAO.java
    M 
server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/rest/service/ETagUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/RestSlugValidator.java
    M 
server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/ui/ActivityEntry.java
    M server/services/src/main/resources/messages.properties
    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/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.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/GlossaryFileServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M server/services/src/test/java/org/zanata/ui/ActivityEntryTest.java
    M 
server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/zanata-frontend/src/frontend/.yarn-version
    M 
server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryItemMatrix.jsx
    M server/zanata-frontend/src/frontend/app/reducers/glossary-reducer.js
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    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-group/projects-tab.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2224


  Commit: c7294457e3c58bda0569a9d2ec95169b2188f35e
      
https://github.com/zanata/zanata-platform/commit/c7294457e3c58bda0569a9d2ec95169b2188f35e
  Author: kgough <kgo...@redhat.com>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  fix(ZNTA-2224) updated editor snapshots


  Commit: d5f0aa24fc461ea8a284d4bc9563368acc3b6ca1
      
https://github.com/zanata/zanata-platform/commit/d5f0aa24fc461ea8a284d4bc9563368acc3b6ca1
  Author: kgough <kgo...@redhat.com>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/CommentBox/index.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/ActivityTab.js
    M 
server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
    M 
server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js
    M 
server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  fix(ZNTA-2224) fix merge conflicts


Compare: 
https://github.com/zanata/zanata-platform/compare/5c5931277304...d5f0aa24fc46
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to