[zanata/zanata-platform] 85dc32: fix(ZNTA-2339) fix FilterToggle backgrounds in edi...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 85dc328eb98c3d2778b073d084a54da6b0785a06
      https://github.com/zanata/zanata-platform/commit/85dc328eb98c3d2778b073d084a54da6b0785a06
  Author: kgough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2339) fix FilterToggle backgrounds in editor


  Commit: c61baf5d5a46b7ceffc85b4eb8f6fcd2903690f4
      https://github.com/zanata/zanata-platform/commit/c61baf5d5a46b7ceffc85b4eb8f6fcd2903690f4
  Author: kathryngo <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

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

  Log Message:
  -----------
  Merge pull request #667 from zanata/ZNTA-2339

fix(ZNTA-2339) fix FilterToggle backgrounds in editor


  Commit: ef79944f50a25a1531b5865f994d5790ac6d8ec2
      https://github.com/zanata/zanata-platform/commit/ef79944f50a25a1531b5865f994d5790ac6d8ec2
  Author: kathryngo <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  fix(ZNTA-2348) increase rows in Settings (client_settings_config) so that scrollbar isn't visible (#669)


  Commit: 6c9a5b33c3c19743d5f47a618ac5f9f3725beb68
      https://github.com/zanata/zanata-platform/commit/6c9a5b33c3c19743d5f47a618ac5f9f3725beb68
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into rel2master


  Commit: 427379e448db11952da4bf97b309deea52e20daf
      https://github.com/zanata/zanata-platform/commit/427379e448db11952da4bf97b309deea52e20daf
  Author: kgough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.css

  Log Message:
  -----------
  fix(rel2master) fix merge conflicts in css


  Commit: f6bcfb503a3a96d90f65a7ed34a72fec4fdcb6f8
      https://github.com/zanata/zanata-platform/commit/f6bcfb503a3a96d90f65a7ed34a72fec4fdcb6f8
  Author: kgough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  fix(add fix from release)


  Commit: 2a4e17d7859025e21f12835582a465ced49b9e89
      https://github.com/zanata/zanata-platform/commit/2a4e17d7859025e21f12835582a465ced49b9e89
  Author: kgough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js

  Log Message:
  -----------
  fix(update snapshot tests)


  Commit: 1e2ce942d72758464c149661e7a62bfdfd776475
      https://github.com/zanata/zanata-platform/commit/1e2ce942d72758464c149661e7a62bfdfd776475
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.css
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge pull request #673 from zanata/rel2master

merge release into master


Compare: https://github.com/zanata/zanata-platform/compare/167f0a99c34f...1e2ce942d727