[zanata/zanata-server] f34ad3: Replace CSS file with JS for loading Google Web Fo...

Fri Jan 30 02:13:13 UTC 2015

  Branch: refs/heads/rhbz1184299
  Home:   https://github.com/zanata/zanata-server
  Commit: f34ad3b1c74ab2d4cf50829ee759134a635fdea0
      https://github.com/zanata/zanata-server/commit/f34ad3b1c74ab2d4cf50829ee759134a635fdea0
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Replace CSS file with JS for loading Google Web Fonts

  Commit: fe5c02ccd42750840eeae62448c36f726e1b3fdb
      https://github.com/zanata/zanata-server/commit/fe5c02ccd42750840eeae62448c36f726e1b3fdb
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Merge branch 'release' into integration/master

* release:
  Replace CSS file with JS for loading Google Web Fonts

  Commit: 4be04f5e536047adfa7f5434b0916804b7bcf92d
      https://github.com/zanata/zanata-server/commit/4be04f5e536047adfa7f5434b0916804b7bcf92d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Fix placeholder in server config page

https://bugzilla.redhat.com/show_bug.cgi?id=1185134

Squashed commit of the following:

commit 42265a7669cddca3a5bb518cbee0b9f67988756d
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 09:29:07 2015 +1000

    Fix input field not save when using same text as placeholder: https://bugzilla.redhat.com/show_bug.cgi?id=1185134

  Commit: a100b9f97b0d43054ae841e995af1cb19011c122
      https://github.com/zanata/zanata-server/commit/a100b9f97b0d43054ae841e995af1cb19011c122
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: b4c6f551505166fea175bd7fa6be833379213f93
      https://github.com/zanata/zanata-server/commit/b4c6f551505166fea175bd7fa6be833379213f93
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Fix readonly first version issue: https://bugzilla.redhat.com/show_bug.cgi?id=1185170

Squashed commit of the following:

commit 10fb15a9645eb4a021ffcfe1d00542842bc30d96
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jan 29 11:24:15 2015 +1000

    Fix readonly first version issue: https://bugzilla.redhat.com/show_bug.cgi?id=1185170

  Commit: cc96b2faac089d22e160b91c1a59f63f666c2267
      https://github.com/zanata/zanata-server/commit/cc96b2faac089d22e160b91c1a59f63f666c2267
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 2c4f87ab89b79ebbe8596faf8ef3bec814118b95
      https://github.com/zanata/zanata-server/commit/2c4f87ab89b79ebbe8596faf8ef3bec814118b95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1184299

Compare: https://github.com/zanata/zanata-server/compare/5abeaad65f11...2c4f87ab89b7