[zanata/zanata-platform] bb2882: Merge pull request #211 from zanata/ZNTA-1732-edit...

[GitHub]

  Branch: refs/heads/ZNTA-1735-editorglossary
  Home:   https://github.com/zanata/zanata-platform
  Commit: bb2882b7a7e103af61bc73c4e065e7d329f612bb
      https://github.com/zanata/zanata-platform/commit/bb2882b7a7e103af61bc73c4e065e7d329f612bb
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M server/zanata-frontend/src/editor/app/actions/index.js
    M server/zanata-frontend/src/editor/app/actions/phrases.js
    M server/zanata-frontend/src/editor/app/actions/suggestions.js
    M server/zanata-frontend/src/editor/app/app.css
    M server/zanata-frontend/src/editor/app/components/TransUnit/index.css
    M server/zanata-frontend/src/editor/app/containers/ControlsHeader.js
    M server/zanata-frontend/src/editor/app/containers/EditorHeader/index.css
    M server/zanata-frontend/src/editor/app/containers/Root/index.css
    M server/zanata-frontend/src/editor/app/containers/Root/index.js
    A server/zanata-frontend/src/editor/app/containers/Sidebar/index.css
    A server/zanata-frontend/src/editor/app/containers/Sidebar/index.js
    A server/zanata-frontend/src/editor/app/containers/SidebarContent.js
    M server/zanata-frontend/src/editor/app/reducers/ui.js
    M server/zanata-frontend/src/editor/package.json
    M server/zanata-frontend/src/editor/yarn.lock
    M server/zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
    A server/zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java

  Log Message:
  -----------
  Merge pull request #211 from zanata/ZNTA-1732-editorsidebar

ZNTA-1732-editorsidebar


  Commit: bd6e59aba1c92d1d5e0d71c7926ec9aa3ee5c54a
      https://github.com/zanata/zanata-platform/commit/bd6e59aba1c92d1d5e0d71c7926ec9aa3ee5c54a
  Author: kgough <kgough at redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

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


Compare: https://github.com/zanata/zanata-platform/compare/f88be5f7fc35...bd6e59aba1c9