[zanata/zanata-server] 9f30ff: Merge branch 'integration/master' into admin-page

[GitHub]

  Branch: refs/heads/admin-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 9f30ff7795fb0967394c750e7707d0279c84e1b8
      https://github.com/zanata/zanata-server/commit/9f30ff7795fb0967394c750e7707d0279c84e1b8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/resources/setup.properties
    A functional-test/src/test/resources/upload-idml.idml
    A functional-test/src/test/resources/upload-odg.odg
    A functional-test/src/test/resources/upload-odp.odp
    A functional-test/src/test/resources/upload-ods.ods
    A functional-test/src/test/resources/upload-odt.odt
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_view.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search-user-dialog.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into admin-page


  Commit: 2cb23f9388ae3664ad085f87f24f100ca64ac352
      https://github.com/zanata/zanata-server/commit/2cb23f9388ae3664ad085f87f24f100ca64ac352
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Update contact coordinator page


Compare: https://github.com/zanata/zanata-server/compare/0c357c5a91e8...2cb23f9388ae