[zanata/zanata-platform] 149275: Merge remote-tracking branch 'origin/master' into ...

[GitHub]

  Branch: refs/heads/playing-with-css
  Home:   https://github.com/zanata/zanata-platform
  Commit: 149275be3c7496ea7a853d9865d4f93eeca3138c
      https://github.com/zanata/zanata-platform/commit/149275be3c7496ea7a853d9865d4f93eeca3138c
  Author: Unknown <kgough at redhat.com>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Changed paths:
    M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    A server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    A server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/LoginAction.java
    M server/services/src/main/java/org/zanata/util/FacesNavigationUtil.java
    M server/services/src/main/java/org/zanata/util/UrlUtil.java
    A server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/action/LoginActionTest.java
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    A server/zanata-frontend/src/frontend/package.json
    A server/zanata-frontend/src/frontend/webpack.config.js
    A server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/a/index.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into playing-with-css


  Commit: 7d49e8538264191fe4418da58ef94507f2b9fc0e
      https://github.com/zanata/zanata-platform/commit/7d49e8538264191fe4418da58ef94507f2b9fc0e
  Author: Unknown <kgough at redhat.com>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/playing-with-css' into playing-with-css


Compare: https://github.com/zanata/zanata-platform/compare/4fd5beb4e403...7d49e8538264