[zanata-commits] [zanata/zanata] 0bbb2a: Merge branch 'rhbz724867' into 1.4

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 0bbb2ad78a787d73643aa126bb66de7b1d294e2d
      https://github.com/zanata/zanata/commit/0bbb2ad78a787d73643aa126bb66de7b1d294e2d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-10-02 (Sun, 02 Oct 2011)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
  M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz724867' into 1.4


  Commit: 38abb54d24ab80223288dda8800af97ea781df60
      https://github.com/zanata/zanata/commit/38abb54d24ab80223288dda8800af97ea781df60
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-02 (Sun, 02 Oct 2011)

  Changed paths:
    M copyright.txt

  Log Message:
  -----------
  Update Asgeir's role


  Commit: 45cb8a044bbafbd1e8fa9c170fbded99e77b6785
      https://github.com/zanata/zanata/commit/45cb8a044bbafbd1e8fa9c170fbded99e77b6785
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-02 (Sun, 02 Oct 2011)

  Changed paths:
    M copyright.txt

  Log Message:
  -----------
  Merge branch '1.4'


  Commit: 9c328c9437ac6613ee1d3c4450c0b1150d4c40c7
      https://github.com/zanata/zanata/commit/9c328c9437ac6613ee1d3c4450c0b1150d4c40c7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-02 (Sun, 02 Oct 2011)

  Changed paths:
    M client/zanata-maven-plugin/demo-props/pom.xml
  M client/zanata-maven-plugin/demo-publican/pom.xml
  M client/zanata-maven-plugin/demo-xliff/pom.xml
  M client/zanata-maven-plugin/demo-xml/pom.xml
  M client/zanata-maven-plugin/sample-scripts/pom.xml

  Log Message:
  -----------
  Update plugin version in demo/sample poms


Compare: https://github.com/zanata/zanata/compare/091b19d...9c328c9