[zanata/zanata-server] 07bb8c: Change dummy implementation for TranslationMemoryS...

[GitHub]

  Branch: refs/heads/tmx-dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: 07bb8cfcb6c32c4ee616f8c038566015538dcc70
      https://github.com/zanata/zanata-server/commit/07bb8cfcb6c32c4ee616f8c038566015538dcc70
  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/TranslationMemoryService.java

  Log Message:
  -----------
  Change dummy implementation for TranslationMemoryService.updateTranslationMemory.

This change is temporary until the changes for TM import are merged into the main branch.


  Commit: 9620e5e7f9d92fe90152f99e26eafc3a62fe0f88
      https://github.com/zanata/zanata-server/commit/9620e5e7f9d92fe90152f99e26eafc3a62fe0f88
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  rhbz990373 disable source upload buttons when no file specified

    A null pointer exception occurred when an upload was submitted
    without first selecting a file. This prevents submission whenever
    a file is not selected.


  Commit: c8d4e99617af85a65c5b787d8b7b432f6804fd4c
      https://github.com/zanata/zanata-server/commit/c8d4e99617af85a65c5b787d8b7b432f6804fd4c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Merge pull request #89 from zanata/disable-null-upload

Fix for rhbz990373 - disables source upload buttons when no file specified


  Commit: f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
      https://github.com/zanata/zanata-server/commit/f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
	zanata-war/src/main/webapp/resources/css/zanata.css


Compare: https://github.com/zanata/zanata-server/compare/2b8ad1acd535...f15ef3f99873