[zanata/zanata] 928519: rhbz795597 Fix regression with Unicode encoding fo...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 92851983e463136cd1023ce68c8a900ed80c4b58
      https://github.com/zanata/zanata/commit/92851983e463136cd1023ce68c8a900ed80c4b58
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java

  Log Message:
  -----------
  rhbz795597 Fix regression with Unicode encoding for ordinary (Latin-1) .properties files


  Commit: b1bd48a26dacf3d6a6ec09d92e2e431aba4efeb5
      https://github.com/zanata/zanata/commit/b1bd48a26dacf3d6a6ec09d92e2e431aba4efeb5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
	client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
	client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java


  Commit: 72859f2b8eccbbfc919a80e1b53d966b76d41e0c
      https://github.com/zanata/zanata/commit/72859f2b8eccbbfc919a80e1b53d966b76d41e0c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
  A server/zanata-war/src/main/java/org/zanata/dao/DatabaseConstants.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/service/CopyTransService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata


Compare: https://github.com/zanata/zanata/compare/54e1d79...72859f2