[zanata/zanata-server] f3592a: Switch back to a synchronous (but fully streamed) ...

[GitHub]

  Branch: refs/heads/tmx-dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: f3592a892017ae3a2bb0e4294cc8c01f44aa6788
      https://github.com/zanata/zanata-server/commit/f3592a892017ae3a2bb0e4294cc8c01f44aa6788
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Switch back to a synchronous (but fully streamed) revision of the TM file upload service.


  Commit: 84f47a60cc49ff02932b70c982120cc966a7a620
      https://github.com/zanata/zanata-server/commit/84f47a60cc49ff02932b70c982120cc966a7a620
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge branch 'tm-import' into tmx-dashboard


  Commit: 635cefff72756848afee91e3f33c2610a65970d9
      https://github.com/zanata/zanata-server/commit/635cefff72756848afee91e3f33c2610a65970d9
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java


  Commit: 7c91740176890206661a08c807244c2649ed5188
      https://github.com/zanata/zanata-server/commit/7c91740176890206661a08c807244c2649ed5188
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml

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


  Commit: 972139b1fac261cde8ed9b5ca5de6357b5afc0e8
      https://github.com/zanata/zanata-server/commit/972139b1fac261cde8ed9b5ca5de6357b5afc0e8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Change templates in Trans Memory pages to the new ones.


Compare: https://github.com/zanata/zanata-server/compare/75633b216230...972139b1fac2