[zanata/zanata-server] 51fd4b: disable rendering in filter list if empty string

[GitHub]

  Branch: refs/heads/rhbz1191779
  Home:   https://github.com/zanata/zanata-server
  Commit: 51fd4b3e3c756b831026f9e01682edebd9fd40b1
      https://github.com/zanata/zanata-server/commit/51fd4b3e3c756b831026f9e01682edebd9fd40b1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

  Log Message:
  -----------
  disable rendering in filter list if empty string
https://bugzilla.redhat.com/show_bug.cgi?id=1190557

Squashed commit of the following:

commit a1c6547965cacd3f1cac600524486f007d689e7e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 11 13:43:00 2015 +1000

    disable rendering in filter list if empty string: https://bugzilla.redhat.com/show_bug.cgi?id=1190557


  Commit: a828049979c44bab4d0415ac8784afacf35f04b7
      https://github.com/zanata/zanata-server/commit/a828049979c44bab4d0415ac8784afacf35f04b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Fix inactive account redirection with openid account

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

Squashed commit of the following:

commit 0ddec629799a6bacc9c24c67d545a841dcd2e0ff
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 12:20:07 2015 +1000

    Fix inactive account redirection with openid account


  Commit: 5aa8e22358bb84498dc566faeb43635d5bdf3212
      https://github.com/zanata/zanata-server/commit/5aa8e22358bb84498dc566faeb43635d5bdf3212
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java


Compare: https://github.com/zanata/zanata-server/compare/9be6611801a0...5aa8e22358bb