Branch: refs/heads/ZNTA-1735-editorglossary
  Home:   https://github.com/zanata/zanata-platform
  Commit: 7b5e9b09b802564f641c2d0acfdb6f12acc99dcd
      
https://github.com/zanata/zanata-platform/commit/7b5e9b09b802564f641c2d0acfdb6f12acc99dcd
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/.storybook/config.js
    M server/zanata-frontend/src/frontend/.storybook/storybook.css
    A server/zanata-frontend/src/frontend/app/components/RBButton/story.js
    A server/zanata-frontend/src/frontend/app/components/stories.js
    M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M 
server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  refactor and add bootstrap css to storybook


  Commit: 50d01f428669889e3e40bb16a4306ef6f0cb935e
      
https://github.com/zanata/zanata-platform/commit/50d01f428669889e3e40bb16a4306ef6f0cb935e
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    M server/zanata-frontend/src/frontend/app/editor/actions/glossary.js
    M server/zanata-frontend/src/frontend/app/editor/actions/phrases.js
    A 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js
    A 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/story.js
    M 
server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
    M 
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/glossary.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/phrase.js
    M server/zanata-frontend/src/frontend/app/editor/utils/string-utils.js
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    A 
server/zanata-war/src/main/java/org/zanata/service/GlossarySearchService.java
    A 
server/zanata-war/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java

  Log Message:
  -----------
  fix merge conflicts


  Commit: 8c519caa4cd73765239d7a30d90f4a6b7bfe789e
      
https://github.com/zanata/zanata-platform/commit/8c519caa4cd73765239d7a30d90f4a6b7bfe789e
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

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

  Log Message:
  -----------
  minor css fixes to glossary in editor


  Commit: 3ca8a68a14841c0c7ae84a1b92dfa54a53ccd0fb
      
https://github.com/zanata/zanata-platform/commit/3ca8a68a14841c0c7ae84a1b92dfa54a53ccd0fb
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

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

  Log Message:
  -----------
  removed redundant css


  Commit: fa6ee1a87c349d7a1e6e0f327986fd68983e2a9c
      
https://github.com/zanata/zanata-platform/commit/fa6ee1a87c349d7a1e6e0f327986fd68983e2a9c
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M 
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/story.js
    M server/zanata-frontend/src/frontend/app/editor/components/stories.js

  Log Message:
  -----------
  Merge branch 'ZNTA-1735-editorglossary' of 
https://github.com/zanata/zanata-platform into ZNTA-1735-editorglossary


  Commit: 020e97ae33bd9365eb9bf61f8d32166f77c0facf
      
https://github.com/zanata/zanata-platform/commit/020e97ae33bd9365eb9bf61f8d32166f77c0facf
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

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

  Log Message:
  -----------
  minor css fixes to editor glossary panel


Compare: 
https://github.com/zanata/zanata-platform/compare/145c9fe8ce96...020e97ae33bd
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to