[zanata/zanata-server] 600d78: rhbz1183412 Uses server's default locale when send...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 600d7882e7e666bdec3e62537d3c3541225fb611
      https://github.com/zanata/zanata-server/commit/600d7882e7e666bdec3e62537d3c3541225fb611
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  rhbz1183412 Uses server's default locale when sending emails


  Commit: 21e1f2173cb8358ff74c1d0666b2addf360710c8
      https://github.com/zanata/zanata-server/commit/21e1f2173cb8358ff74c1d0666b2addf360710c8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    A docs/release-notes.md

  Log Message:
  -----------
  Copy release notes from master (except 3.7)


  Commit: e45bed1ab688e57a87eaa90d985d58a21a69079d
      https://github.com/zanata/zanata-server/commit/e45bed1ab688e57a87eaa90d985d58a21a69079d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes for rhbz1183412


  Commit: a649964165e1e89806334b0a346dd79e620b4bce
      https://github.com/zanata/zanata-server/commit/a649964165e1e89806334b0a346dd79e620b4bce
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: fe9939daf11fdd3feb2302e241cda4aab85de8cd
      https://github.com/zanata/zanata-server/commit/fe9939daf11fdd3feb2302e241cda4aab85de8cd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    A docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Merge pull request #740 from zanata/rhbz1183412

rhbz1183412 Use server's default locale when sending emails


  Commit: 3e944285f6b92a4729729bcd6fb8feda54f297bb
      https://github.com/zanata/zanata-server/commit/3e944285f6b92a4729729bcd6fb8feda54f297bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master

Conflicts:
	docs/release-notes.md


Compare: https://github.com/zanata/zanata-server/compare/1e5a2f13cf18...3e944285f6b9