[zanata/zanata-server] 08a0de: Update api to 3.1.1

[GitHub]

  Branch: refs/heads/editor-cleanup
  Home:   https://github.com/zanata/zanata-server
  Commit: 08a0de341b9118b4497b387afcaae93daaf74f31
      https://github.com/zanata/zanata-server/commit/08a0de341b9118b4497b387afcaae93daaf74f31
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update api to 3.1.1


  Commit: e2bb0f983523e920c012a921a0ef34a086ee00c3
      https://github.com/zanata/zanata-server/commit/e2bb0f983523e920c012a921a0ef34a086ee00c3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.1.1


  Commit: a1b6390a5d5155670b6ca047e1ec3e313f0e1517
      https://github.com/zanata/zanata-server/commit/a1b6390a5d5155670b6ca047e1ec3e313f0e1517
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: cd9e8627a48cbf6eca0b8575be44eb4c91742874
      https://github.com/zanata/zanata-server/commit/cd9e8627a48cbf6eca0b8575be44eb4c91742874
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Cleanup line feed in pom.xml


  Commit: 22b518f8075e51450a0b01a5f3364a79860bb1da
      https://github.com/zanata/zanata-server/commit/22b518f8075e51450a0b01a5f3364a79860bb1da
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #232 from zanata/line-feed-cleaup

Cleanup line feed in zanata-war/pom.xml


  Commit: a13eba398e5d7ec1788e704a701e78f3154dfbab
      https://github.com/zanata/zanata-server/commit/a13eba398e5d7ec1788e704a701e78f3154dfbab
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into editor-cleanup


  Commit: d277ede4d7f2d5ff58c19b1040d81506f4b3a73a
      https://github.com/zanata/zanata-server/commit/d277ede4d7f2d5ff58c19b1040d81506f4b3a73a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Work in progress: tm merge form refactor


Compare: https://github.com/zanata/zanata-server/compare/9374736c89aa...d277ede4d7f2