[zanata-commits] [zanata/zanata] 71fdfb: Make project table sortable: https://bugzilla.redh...

[noreply at github.com]

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

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

  Changed paths:
    M server/zanata-war/src/main/webapp/project/home.xhtml

  Log Message:
  -----------
  Make project table sortable: https://bugzilla.redhat.com/show_bug.cgi?id=742111


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

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
  R server/zanata-war/src/main/webapp/WEB-INF/layout/project_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
  M server/zanata-war/src/main/webapp/language/home.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/search.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge conflict from rhbz742111 to 1.4 branch


Compare: https://github.com/zanata/zanata/compare/0bbb2ad...7177223