Branch: refs/heads/damason/advanced-search-component/ZNTA-1737
  Home:   https://github.com/zanata/zanata-platform
  Commit: b13f498638b092d888ff6b6209123d4f18aeb54f
      
https://github.com/zanata/zanata-platform/commit/b13f498638b092d888ff6b6209123d4f18aeb54f
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.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/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java

  Log Message:
  -----------
  refactor: move locales service to common api


  Commit: c3f193d2d7560299991df9a3fe36642ba9e66bbc
      
https://github.com/zanata/zanata-platform/commit/c3f193d2d7560299991df9a3fe36642ba9e66bbc
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/components/Notification/component.js

  Log Message:
  -----------
  fix: remove unused import


  Commit: 6e8e1a3f5d2f0a7aa2aff897b5f981b81eb91f19
      
https://github.com/zanata/zanata-platform/commit/6e8e1a3f5d2f0a7aa2aff897b5f981b81eb91f19
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/components/Notification/component.js

  Log Message:
  -----------
  Merge pull request #287 from zanata/fix-build

fix: remove unused import


  Commit: d645765b56a4709d0cc69f195b56d08813af9454
      
https://github.com/zanata/zanata-platform/commit/d645765b56a4709d0cc69f195b56d08813af9454
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LanguageTeamSearchResult.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleMember.java
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocalesResults.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LanguageTeamSearchResultTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocaleMemberTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocalesResultsTest.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/dto/LocalesResults.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/LanguageTeamSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/PersonSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResults.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.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/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    R 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java

  Log Message:
  -----------
  feat: api for locale member list

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


  Commit: 5923992dfa39651b7691eb90bfe4d7eb66e8aa6e
      
https://github.com/zanata/zanata-platform/commit/5923992dfa39651b7691eb90bfe4d7eb66e8aa6e
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LanguageTeamSearchResult.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleMember.java
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocalesResults.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LanguageTeamSearchResultTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocaleMemberTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocalesResultsTest.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/dto/LocalesResults.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/LanguageTeamSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/PersonSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResults.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.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/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    R 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #288 from zanata/ZNTA-1915-language-users

Znta 1915 language users


  Commit: 88e787ff7d88e348a28d9f57edfa51a6a790ec65
      
https://github.com/zanata/zanata-platform/commit/88e787ff7d88e348a28d9f57edfa51a6a790ec65
  Author: kgough <kgo...@redhat.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js

  Log Message:
  -----------
  removed zanata-ui modals from editor


  Commit: 282c8a317a8dc0c6c10fe588517c7b6d980a3bfb
      
https://github.com/zanata/zanata-platform/commit/282c8a317a8dc0c6c10fe588517c7b6d980a3bfb
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M Jenkinsfile
    M build-tools/src/main/resources/zanata-build-tools/findbugs-filter.xml

  Log Message:
  -----------
  chore: enable WarningsPublisher/AnalysisPublisher (#279)


  Commit: 48f1eeac834df071382e803bd808f1f9be7f86df
      
https://github.com/zanata/zanata-platform/commit/48f1eeac834df071382e803bd808f1f9be7f86df
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js

  Log Message:
  -----------
  Merge pull request #289 from zanata/ZNTA-1838-reactmodal-editor

removed zanata-ui modals from editor


  Commit: 80508a1fa6a632e3e25ce95933cc1c25bcdbc95e
      
https://github.com/zanata/zanata-platform/commit/80508a1fa6a632e3e25ce95933cc1c25bcdbc95e
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M server/pom.xml
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Avoid hibernate-testing.jar in Arquillian tests (#284)

* Use InfinispanRegionFactory for Arquillian
* Use hibernate-testing's CachingRegionFactory for unit tests only


  Commit: cee23eb27cc300abe690984717701f54d4ec8730
      
https://github.com/zanata/zanata-platform/commit/cee23eb27cc300abe690984717701f54d4ec8730
  Author: David Mason <drdma...@gmail.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M Jenkinsfile
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LanguageTeamSearchResult.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleMember.java
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocalesResults.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    A 
api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LanguageTeamSearchResultTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocaleMemberTest.java
    A 
api/zanata-common-api/src/test/java/org/zanata/rest/dto/LocalesResultsTest.java
    M build-tools/src/main/resources/zanata-build-tools/findbugs-filter.xml
    M server/pom.xml
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/dto/LocalesResults.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/LanguageTeamSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/PersonSearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResult.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResults.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.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/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    R 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
    M server/zanata-war/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge branch 'master' into damason/advanced-search-component/ZNTA-1737

Conflicts:
  server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    Some css added in both master and the branch. Kept both.


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

Reply via email to