[zanata/zanata-server] 0f16ef: WIP

2016-03-31 Thread GitHub 
  Branch: refs/heads/ZNTA-987-import-bug
  Home:   https://github.com/zanata/zanata-server
  Commit: 0f16efc0b587ad2c0c53051195a79c247314aeb8
  
https://github.com/zanata/zanata-server/commit/0f16efc0b587ad2c0c53051195a79c247314aeb8
  Author: Sean Flanigan 
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java

  Log Message:
  ---
  WIP


  Commit: 9a77b37ed4e04daae46884e8fbf12ccc5be91450
  
https://github.com/zanata/zanata-server/commit/9a77b37ed4e04daae46884e8fbf12ccc5be91450
  Author: Sean Flanigan 
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  ---
  fix(ZNTA-987): track deleted HTextFlowTargets by ID

The equals method for HTextFlowTargets won't recognise the object if
any fields have changed, so tracking by ID is safer (unless we implement
business key equality).


Compare: 
https://github.com/zanata/zanata-server/compare/0f16efc0b587^...9a77b37ed4e0___
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

[zanata/zanata-client]

2016-03-31 Thread GitHub 
  Branch: refs/heads/simplify-parent
  Home:   https://github.com/zanata/zanata-client
___
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

[zanata/zanata-client] c328be: Move powermock config from parent to client

2016-03-31 Thread GitHub 
  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-client
  Commit: c328bea708426d95ef5395c1d9993ceab250224a
  
https://github.com/zanata/zanata-client/commit/c328bea708426d95ef5395c1d9993ceab250224a
  Author: Sean Flanigan 
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Move powermock config from parent to client


  Commit: e8c5db57df168369edf22655932fba736c9c611e
  
https://github.com/zanata/zanata-client/commit/e8c5db57df168369edf22655932fba736c9c611e
  Author: Sean Flanigan 
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Merge pull request #106 from zanata/simplify-parent

Simplify parent


Compare: 
https://github.com/zanata/zanata-client/compare/dd0e539c8dff...e8c5db57df16___
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

[zanata/zanata-parent] 68e797: Upgrade required Maven version

2016-03-31 Thread GitHub 
  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-parent
  Commit: 68e797545c03948cb56a7abf8bd0867ba4ca949f
  
https://github.com/zanata/zanata-parent/commit/68e797545c03948cb56a7abf8bd0867ba4ca949f
  Author: Sean Flanigan 
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Upgrade required Maven version


  Commit: c34b4657bb46f845d3881e893b26e40f0c58abfc
  
https://github.com/zanata/zanata-parent/commit/c34b4657bb46f845d3881e893b26e40f0c58abfc
  Author: Sean Flanigan 
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Merge pull request #56 from zanata/upgrade-maven

Upgrade required Maven version


Compare: 
https://github.com/zanata/zanata-parent/compare/a73aa6637869...c34b4657bb46___
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

[zanata/zanata-parent]

2016-03-31 Thread GitHub 
  Branch: refs/heads/upgrade-maven
  Home:   https://github.com/zanata/zanata-parent
___
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

[zanata/zanata-server] 29e9bc: Organise nav on sidebar

2016-03-31 Thread GitHub 
  Branch: refs/heads/redux-app
  Home:   https://github.com/zanata/zanata-server
  Commit: 29e9bcfc4381bb46b07850d680e9f441feb2aad6
  
https://github.com/zanata/zanata-server/commit/29e9bcfc4381bb46b07850d680e9f441feb2aad6
  Author: Alex Eng 
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
M frontend/src/main/web/scripts/generateIconList.js
M frontend/src/main/web/src/components/Link.jsx
M frontend/src/main/web/src/components/Nav.jsx
M frontend/src/main/web/src/components/NavItem.jsx
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
M zanata-war/src/main/webapp/a/more.xhtml

  Log Message:
  ---
  Organise nav on sidebar


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