[zanata/zanata-server] 4941cc: rhbz1066756 - Fix functional tests after merging ...

[GitHub]

  Branch: refs/heads/rhbz1066756
  Home:   https://github.com/zanata/zanata-server
  Commit: 4941cc8e8f6a8399b58ae410b963ef935aca9cd3
      https://github.com/zanata/zanata-server/commit/4941cc8e8f6a8399b58ae410b963ef935aca9cd3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
   rhbz1066756 - Fix functional tests after merging with latest master.


  Commit: 376114b00bf76f829520faa833522fc028b50c82
      https://github.com/zanata/zanata-server/commit/376114b00bf76f829520faa833522fc028b50c82
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
   rhbz1066756 - QA review changes


  Commit: 8cf49f33cea91e0d71e858e9a1ff50955cd13f5a
      https://github.com/zanata/zanata-server/commit/8cf49f33cea91e0d71e858e9a1ff50955cd13f5a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Log Message:
  -----------
  Merge branch 'rhbz1066756' of github.com:zanata/zanata into rhbz1066756

Conflicts:
	zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java


Compare: https://github.com/zanata/zanata-server/compare/7b87d66f6b9b...8cf49f33cea9