[zanata/zanata-server] 91ce54: fix(File upload): Remove file extension for gettex...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 91ce54abb0c639fe12053e0d1de9d470561f45a9
      https://github.com/zanata/zanata-server/commit/91ce54abb0c639fe12053e0d1de9d470561f45a9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  fix(File upload): Remove file extension for gettext type upload in UI (#1165)

https://zanata.atlassian.net/browse/ZNTA-981


  Commit: 876463bded1831f11a18d04fe0f20881750aa0e6
      https://github.com/zanata/zanata-server/commit/876463bded1831f11a18d04fe0f20881750aa0e6
  Author: arm <armagan.ersoz at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java

  Log Message:
  -----------
  fix(ZNTA-931): change Dependent scope to Request (#1159)

Make hibernate session object independent from EM. It causes closing the
hibernate session before transaction is completed


  Commit: fe759f9787683a596c4649465fd64ad0cef22ea0
      https://github.com/zanata/zanata-server/commit/fe759f9787683a596c4649465fd64ad0cef22ea0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(translation): check for null target when performing translation (#1167)

https://zanata.atlassian.net/browse/ZNTA-1086


  Commit: 06d25c5e93bdec274c2727d1493b6c70f8bb2545
      https://github.com/zanata/zanata-server/commit/06d25c5e93bdec274c2727d1493b6c70f8bb2545
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix: NoSuchElementException in event handler (#1164)


  Commit: 8c62fe94c3840f9008ea900d87dc2b8e528301d4
      https://github.com/zanata/zanata-server/commit/8c62fe94c3840f9008ea900d87dc2b8e528301d4
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies


  Commit: b7e35713bdc2791ecc9216a927401e7349869208
      https://github.com/zanata/zanata-server/commit/b7e35713bdc2791ecc9216a927401e7349869208
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

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

  Log Message:
  -----------
  fix(pom): fix 3.9.0 warning (#1170)

* fix(pom): fix 3.9.0 warning

* fix(pom): sync the commons-codec to version 1.10

* fix(pom): fix the Used undeclared dependencies warning

* fix(pom): fix the trailing spaces


  Commit: 463bef8a5ac655972d487af3cfb30d28147fc4a1
      https://github.com/zanata/zanata-server/commit/463bef8a5ac655972d487af3cfb30d28147fc4a1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M docs/release-notes.md
    M functional-test/pom.xml
    M pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(merge): fix merge conflict

Merge branch 'release'


Compare: https://github.com/zanata/zanata-server/compare/25bff0aac7f3...463bef8a5ac6