Branch: refs/heads/ZNTA-1771-tmx
  Home:   https://github.com/zanata/zanata-platform
  Commit: 731e9334feefbc0d211138561ceb473539820fbe
      
https://github.com/zanata/zanata-platform/commit/731e9334feefbc0d211138561ceb473539820fbe
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
    M server/zanata-frontend/src/frontend/app/actions/version-actions.js
    M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
    A server/zanata-frontend/src/frontend/app/components/TMX/TMXExportModal.js
    A server/zanata-frontend/src/frontend/app/components/TMX/index.css
    A server/zanata-frontend/src/frontend/app/containers/Admin/index.js
    A server/zanata-frontend/src/frontend/app/containers/Project/index.js
    M 
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    M 
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    R server/zanata-frontend/src/frontend/app/containers/TMX/index.css
    R server/zanata-frontend/src/frontend/app/containers/TMX/index.js
    M 
server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M 
server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M 
server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    M server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M 
server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    A 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java

  Log Message:
  -----------
  chore: integrate with project tmx
chore: integrate with admin tmx
chore: integrate with project version tmx


_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to